Merge branch 'dev-lqc' into test

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

@@ -106,7 +106,13 @@ public class FosterwxCashWorkClientController {
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
-                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = null;
+                if (1 == fosterwxCashScheduleTaskList.getTaskType()) {
+                    fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                }
+                if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
+                    fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                }
                 if (null != fosterwxCashWorkBoxClientInfo) {
                     FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
                     boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashScheduleTaskListServiceImpl.java

@@ -239,6 +239,17 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
     @Override
     public void editWorkBoxUrl(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList, FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList) {
+        // 直发小程序
+        if (fosterwxCashScheduleTaskList.getTaskType() == 3) {
+            fosterwxCashScheduleTaskList.setGhId(fosterwxCashWorkwxTaskList.getBoxAppid());
+            fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashWorkwxTaskList.getBoxAppid());
+            fosterwxCashScheduleTaskList.setSendUrl(fosterwxCashWorkwxTaskList.getBoxPath());
+            fosterwxCashScheduleTaskList.setBoxUrl(fosterwxCashWorkwxTaskList.getBoxPath());
+
+            fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
+            return;
+        }
+
         FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
         if (null == fosterwxCashOasBox) {
             // 状态
@@ -247,10 +258,10 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             fosterwxCashScheduleTaskList.setErrInfo("该分组下没有可用的公众号");
 
             fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
+
+            return;
         }
 
-        log.info("{}", fosterwxCashScheduleTaskList);
-        log.info("{}", fosterwxCashOasBox);
         fosterwxCashOasBoxService.addSendTextCnt(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashOasBox.getGhId());
 
         // 状态