Merge branch 'dev-lqc' into test

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

@@ -1,6 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashAccountSchedule;
 import org.apache.ibatis.annotations.Param;
@@ -18,5 +18,5 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashAccountScheduleMapper extends BaseMapper<FosterwxCashAccountSchedule> {
-    public List<FosterwxCashAccountSchedule> getList(@Param("ew") LambdaQueryWrapper<FosterwxCashAccountSchedule> querryWraper, @Param("pagesize") Integer pagesize, @Param("i") int i);
+    public List<FosterwxCashAccountSchedule> getList(@Param("ew") QueryWrapper<FosterwxCashAccountSchedule> querryWraper, @Param("pagesize") Integer pagesize, @Param("i") int i);
 }

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

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.service.pangu.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashAccountScheduleHandle;
@@ -51,25 +52,41 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
     public ResHandle<List<FosterwxCashAccountSchedule>> getList(FosterwxCashAccountScheduleHandle handle) {
         Integer pagesize = handle.getPageSize();
         Integer page = handle.getPage();
-        LambdaQueryWrapper<FosterwxCashAccountSchedule> fosterwxCashAccountScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<FosterwxCashAccountSchedule> fosterwxCashAccountScheduleQueryWrapper = new QueryWrapper<>();
         // 排期日期
-        fosterwxCashAccountScheduleLambdaQueryWrapper.eq(FosterwxCashAccountSchedule::getScheduleDate, handle.getScheduleDate());
+        fosterwxCashAccountScheduleQueryWrapper.eq("account_schedule.schedule_date", handle.getScheduleDate());
         // 任务类型 1：个微任务 2：企微任务
-        fosterwxCashAccountScheduleLambdaQueryWrapper.eq(FosterwxCashAccountSchedule::getType, handle.getType());
+        fosterwxCashAccountScheduleQueryWrapper.eq("account_schedule.type", handle.getType());
 
         // 任务模板
         if (null != handle.getTemplateId())
-            fosterwxCashAccountScheduleLambdaQueryWrapper.eq(FosterwxCashAccountSchedule::getTemplateId, handle.getTemplateId());
+            fosterwxCashAccountScheduleQueryWrapper.eq("account_schedule.template_id", handle.getTemplateId());
         // 创建人
         if (null != handle.getCreateUid())
-            fosterwxCashAccountScheduleLambdaQueryWrapper.eq(FosterwxCashAccountSchedule::getCreateUid, handle.getCreateUid());
+            fosterwxCashAccountScheduleQueryWrapper.eq("account_schedule.create_uid", handle.getCreateUid());
+
         // 账号组别
         if (null != handle.getGroupId())
-            fosterwxCashAccountScheduleLambdaQueryWrapper.eq(FosterwxCashAccountSchedule::getGroupId, handle.getGroupId());
+            fosterwxCashAccountScheduleQueryWrapper.eq("account_schedule.group_id", handle.getGroupId());
         // 获取总件数
-        Long maxCount = Long.valueOf(fosterwxCashAccountScheduleMapper.selectCount(fosterwxCashAccountScheduleLambdaQueryWrapper));
+        QueryWrapper<FosterwxCashAccountSchedule> countWrapper = new QueryWrapper<>();
+        // 排期日期
+        countWrapper.eq("schedule_date", handle.getScheduleDate());
+        // 任务类型 1：个微任务 2：企微任务
+        countWrapper.eq("type", handle.getType());
+
+        // 任务模板
+        if (null != handle.getTemplateId())
+            countWrapper.eq("template_id", handle.getTemplateId());
+        // 创建人
+        if (null != handle.getCreateUid())
+            countWrapper.eq("create_uid", handle.getCreateUid());
+        // 账号组别
+        if (null != handle.getGroupId())
+            countWrapper.eq("group_id", handle.getGroupId());
+        Long maxCount = Long.valueOf(fosterwxCashAccountScheduleMapper.selectCount(countWrapper));
 
-        List<FosterwxCashAccountSchedule> list = fosterwxCashAccountScheduleMapper.getList(fosterwxCashAccountScheduleLambdaQueryWrapper, pagesize, (page - 1) * pagesize);
+        List<FosterwxCashAccountSchedule> list = fosterwxCashAccountScheduleMapper.getList(fosterwxCashAccountScheduleQueryWrapper, pagesize, (page - 1) * pagesize);
         ResHandle<List<FosterwxCashAccountSchedule>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(maxCount);

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

@@ -137,7 +137,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             fosterwxCashScheduleTaskList.setSendUrl("");
 
             if (fosterwxCashScheduleTaskList.getTaskType() == 1) {
-                fosterwxCashScheduleTaskList.setBoxInfo(coralApiService.getBoxInfo(ghid));
+                fosterwxCashScheduleTaskList.setBoxInfo(coralApiService.getBoxInfo(fosterwxCashScheduleTaskList.getBoxGhid()));
             }
 
             fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);