Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashAccountScheduleMapper.xml

@@ -23,10 +23,9 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashAccountSchedule">
         SELECT
-            account_schedule.id,
+            account_schedule.*,
             mobile_group.group_name,
             task_template.template_name,
-            account_schedule.create_user,
             (
                 SELECT
                     count( id )

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

@@ -109,7 +109,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         List<FosterwxCashScheduleTaskList> tempList = new ArrayList<>();
         for (int i = 0; i < newsList.size(); i++) {
             if (count == 8) {
-                fosterwxCashOasBoxService.addSendTextCnt(ghid);
+                fosterwxCashOasBoxService.addSendTextCnt(newsList.get(0).getGroupId(), ghid);
 
                 taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
                 tempList.clear();
@@ -135,7 +135,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             newsList.remove(i);
             i--;
         }
-        fosterwxCashOasBoxService.addSendTextCnt(ghid);
+        fosterwxCashOasBoxService.addSendTextCnt(newsList.get(0).getGroupId(), ghid);
         taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
         tempList.clear();
     }