Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -44,7 +44,7 @@ public class FosterwxCashWorkClientController {
     private FosterwxMobileService fosterwxMobileService;
 
     @Autowired
-    private FosterwxCashMobileService fosterwxCashMobileService;
+    private FosterwxCashWorkwxMobileService fosterwxCashWorkwxMobileService;
 
     @Autowired
     private FosterwxCashWorkBoxClientInfoService fosterwxCashWorkBoxClientInfoService;
@@ -72,9 +72,9 @@ public class FosterwxCashWorkClientController {
         if (null == fosterwxMobile) return AjaxResult.error("根据参数无法获取所属账号");
 
         // 根据手机id 获取分组id
-        FosterwxCashMobile fosterwxCashMobile = fosterwxCashMobileService.getOne(new LambdaQueryWrapper<FosterwxCashMobile>().eq(FosterwxCashMobile::getMobileId, fosterwxMobile.getId()).last("LIMIT 1"));
+        FosterwxCashWorkwxMobile fosterwxCashWorkwxMobile = fosterwxCashWorkwxMobileService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxMobile>().eq(FosterwxCashWorkwxMobile::getMobileId, fosterwxMobile.getId()).last("LIMIT 1"));
 
-        if (null == fosterwxCashMobile) return AjaxResult.error("该账号未划入变现分组");
+        if (null == fosterwxCashWorkwxMobile) return AjaxResult.error("该账号未划入变现分组");
 
         LocalDate now = LocalDate.now();
         LocalDateTime firstDateTime = LocalDateTime.of(now, LocalTime.MIN);
@@ -84,7 +84,7 @@ public class FosterwxCashWorkClientController {
         // 企微任务
         fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getType, 2);
         // 分组id
-        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, fosterwxCashMobile.getGroupId());
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, fosterwxCashWorkwxMobile.getGroupId());
         // 已生成的任务 待发送的任务
         fosterwxCashScheduleTaskListLambdaQueryWrapper.in(FosterwxCashScheduleTaskList::getStatus, 2, 4);