Merge branch 'test' of http://git.mokasz.com/marketing/moka-private into test

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

@@ -120,7 +120,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
         String ghid = "";
         Integer groupId = editList.get(0).getGroupId();
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(),editList.get(0).getType());
+        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
         if (null != fosterwxCashOasBox) {
             ghid = fosterwxCashOasBox.getGhId();
         }
@@ -132,7 +132,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
                 taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
                 tempList.clear();
-                fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(),editList.get(0).getType());
+                fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
                 if (null != fosterwxCashOasBox) {
                     ghid = fosterwxCashOasBox.getGhId();
                 }
@@ -201,7 +201,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
      */
     @Override
     public void editBoxUrl(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList, FosterwxCashTaskList fosterwxCashTaskList) {
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(),fosterwxCashScheduleTaskList.getType());
+        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashScheduleTaskList.getType());
         if (null == fosterwxCashOasBox) {
             // 状态
             fosterwxCashScheduleTaskList.setStatus(3);
@@ -255,20 +255,20 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
             return;
         }
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(),fosterwxCashScheduleTaskList.getType());
 
-        if (null == fosterwxCashOasBox) {
-            // 状态
-            fosterwxCashScheduleTaskList.setStatus(3);
-            // 失败原因
-            fosterwxCashScheduleTaskList.setErrInfo("该分组下没有可用的公众号");
-
-            fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
-
-            return;
-        }
+        // FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
+        // if (null == fosterwxCashOasBox) {
+        //     // 状态
+        //     fosterwxCashScheduleTaskList.setStatus(3);
+        //     // 失败原因
+        //     fosterwxCashScheduleTaskList.setErrInfo("该分组下没有可用的公众号");
+        //
+        //     fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
+        //
+        //     return;
+        // }
 
-        fosterwxCashOasBoxService.addSendTextCnt(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashOasBox.getGhId());
+        fosterwxCashOasBoxService.addSendTextCnt(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashWorkwxTaskList.getGhId());
 
         // 状态
         if (3 != fosterwxCashWorkwxTaskList.getTaskType())
@@ -277,9 +277,9 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         fosterwxCashScheduleTaskList.setErrInfo("");
         // 分配的公众号
         if (3 == fosterwxCashWorkwxTaskList.getTaskType()) {
-            fosterwxCashScheduleTaskList.setGhId(fosterwxCashOasBox.getGhId());
+            fosterwxCashScheduleTaskList.setGhId(fosterwxCashWorkwxTaskList.getBoxGhId());
         }
-        fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashOasBox.getGhId());
+        fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashWorkwxTaskList.getBoxGhId());
 
         // 小程序链接
         String sendUrl = "";