Merge branch 'dev-lqc' into test

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

@@ -124,7 +124,7 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
                 // 任务类型为链接是直接赋值
                 if (4 == fosterwxCashTaskList.getTaskType()) {
                     fosterwxCashScheduleTaskList.setSendUrl(fosterwxCashTaskList.getUrl());
-                    fosterwxCashScheduleTaskList.setStatus(2);
+                    fosterwxCashScheduleTaskList.setStatus(4);
                     fosterwxCashScheduleTaskList.setErrInfo("");
                 } else {
                     fosterwxCashScheduleTaskList.setSendUrl("");

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

@@ -27,24 +27,6 @@ public class SyncFosterwxCash {
     private TaskRedis taskRedis;
 
     /**
-     * 每隔一分钟扫描今天待发送以及已经发送的任务
-     */
-    // @Scheduled(cron = "10 */1 * * * ?")
-    // @SchedulerLock(name = "pangu:SyncFosterwxCash", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
-    // public void syncFosterwxCash() {
-    //     // 获取当前时间
-    //     LocalDateTime minDateTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
-    //     LocalDateTime localDateTime = LocalDateTime.now();
-    //
-    //     List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskLists = fosterwxCashScheduleTaskListService.list(
-    //             new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().
-    //                     eq(FosterwxCashScheduleTaskList::getType, 1).
-    //                     between(FosterwxCashScheduleTaskList::getSendTime, minDateTime, localDateTime));
-    //
-    //     stringRedisTemplate.opsForHash().put("pan_fosterwx_cash_group_id:", null, null);
-    // }
-
-    /**
      * 定时同步typer已经生成的url
      */
     @Scheduled(cron = "20 */1 * * * ?")
@@ -59,7 +41,7 @@ public class SyncFosterwxCash {
                 fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
                     setId(Integer.valueOf(jsonObject.get("automatic_id").toString()));
                     setSendUrl(jsonObject.get("article_url").toString());
-                    setStatus(2);
+                    setStatus(4);
                 }});
             } else {
                 fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{