Merge branch 'dev-lqc' into test

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

@@ -11,6 +11,7 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashAccountSchedule;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.FosterwxCashAccountScheduleService;
+import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -42,6 +43,9 @@ public class FosterwxCashAccountScheduleController extends BaseController<Foster
     @Autowired
     public FosterwxCashAccountScheduleService fosterwxCashAccountScheduleService;
 
+    @Autowired
+    public FosterwxCashScheduleTaskListService fosterwxCashScheduleTaskListService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -113,5 +117,19 @@ public class FosterwxCashAccountScheduleController extends BaseController<Foster
 
         return AjaxResult.success("立即生成成功");
     }
+
+    @PostMapping("/preview")
+    public Object priview(FosterwxCashAccountScheduleHandle handle) {
+        // TODO 等老王的接口
+
+        return AjaxResult.success("");
+    }
+
+    @PostMapping("/cancelTask")
+    public Object cancelTask(FosterwxCashAccountScheduleHandle handle, @AuthUser User user) {
+        Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
+
+        return AjaxResult.success("取消任务成功");
+    }
 }
 

src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashScheduleTaskListService.java

@@ -1,11 +1,12 @@
 package com.mokamrp.privates.service.pangu;
 
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
+
 import java.util.List;
-import java.util.Map;
+
 /**
  * <p>
  * 盘古微信变现排期任务列表 服务类
@@ -17,4 +18,12 @@ import java.util.Map;
 public interface FosterwxCashScheduleTaskListService extends IService<FosterwxCashScheduleTaskList> {
     //.@leon 获取数据列表
     public ResHandle<List<FosterwxCashScheduleTaskList>> getList(PostBasePageHandle handle);
+
+
+    /**
+     * 根据排期id 取消任务
+     * @param id
+     * @param userId
+     */
+    void cancelTask(Integer id, Integer userId);
 }

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

@@ -6,10 +6,12 @@ import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashAccountScheduleHandle;
 import com.mokamrp.privates.mapper.pangu.FosterwxCashAccountScheduleMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashAccountSchedule;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
 import com.mokamrp.privates.service.pangu.FosterwxCashAccountScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,6 +54,12 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
 
         if (null != fosterwxCashAccountSchedule) {
             // 根据任务模板id获取任务模板详情
+            // TODO 需要老王那边配合写个方法
+            List<FosterwxCashTaskList> fosterwxCashTaskLists = new ArrayList<>();
+
+            fosterwxCashTaskLists.forEach(fosterwxCashTaskList -> {
+
+            });
         }
     }
 }

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

@@ -1,16 +1,18 @@
 package com.mokamrp.privates.service.pangu.impl;
 
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
-import com.mokamrp.privates.mapper.pangu.FosterwxCashScheduleTaskListMapper;
-import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import com.mokamrp.privates.entity.ResHandle;
-import java.util.*;
+import com.mokamrp.privates.mapper.pangu.FosterwxCashScheduleTaskListMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
+import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +27,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
     @Autowired
     public FosterwxCashScheduleTaskListMapper fosterwxCashScheduleTaskListMapper;
+
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -40,4 +43,22 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         res.setTotal(pageObj.getTotal());
         return res;
     }
+
+    /**
+     * 根据排期id 取消任务
+     * @param id
+     * @param userId
+     */
+    @Override
+    public void cancelTask(Integer id, Integer userId) {
+        LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getScheduleId, id);
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.notIn(FosterwxCashScheduleTaskList::getStatus, 3, 5, 6);
+
+        fosterwxCashScheduleTaskListMapper.update(new FosterwxCashScheduleTaskList() {{
+            setStatus(6);
+            setUpdateUid(userId);
+            setUpdateAt(LocalDateTime.now());
+        }}, fosterwxCashScheduleTaskListLambdaQueryWrapper);
+    }
 }