Merge branch 'dev-lqc' into test

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

@@ -65,12 +65,12 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
         return AjaxResult.success("取消任务成功");
     }
 
-    @PostMapping("/reCreate")
-    @ApiOperation("重新生成")
-    public Object reCreate(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList) {
-        fosterwxCashScheduleTaskListService.create(fosterwxCashScheduleTaskList);
-
-        return AjaxResult.success("重新生成成功");
-    }
+    // @PostMapping("/reCreate")
+    // @ApiOperation("重新生成")
+    // public Object reCreate(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList) {
+    //     fosterwxCashScheduleTaskListService.create(fosterwxCashScheduleTaskList);
+    //
+    //     return AjaxResult.success("重新生成成功");
+    // }
 }
 

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

@@ -127,5 +127,6 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
 
             return newsList;
         }
+        return null;
     }
 }

src/main/java/com/mokamrp/privates/task/pangu/SyncCreateCashTask.java

@@ -110,9 +110,9 @@ public class SyncCreateCashTask {
         fosterwxCashScheduleTaskLists.forEach(fosterwxCashScheduleTaskList -> {
             // 飞书通知消息设置
             content.add(getJsonArray("任务ID：" + fosterwxCashScheduleTaskList.getId() + " 公众号: " + fosterwxCashScheduleTaskList.getGhId() + " 发送时间：" + fosterwxCashScheduleTaskList.getSendTime()));
-            // 重新创建
-            fosterwxCashScheduleTaskListService.create(fosterwxCashScheduleTaskList);
         });
+        // 重新创建
+        fosterwxCashScheduleTaskListService.create(fosterwxCashScheduleTaskLists);
 
         if (content.size() > 0) {
             JSONObject post = new JSONObject();