TRX 1 tahun lalu
induk
melakukan
54c16aea2b

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/schedule/impl/ScheduleTaskConfigDaoImpl.java

@@ -54,7 +54,8 @@ public class ScheduleTaskConfigDaoImpl extends BaseImpl implements ScheduleTaskC
     public boolean release(String key) {
         Query releaseQuery = Query.query(Criteria.where("_id").is(key));
         Update releaseUpdate = new Update().set("expireAt", null).set("token", null);
-        FindAndModifyOptions releaseOptions = new FindAndModifyOptions().upsert(true).returnNew(true);
+        // 不存在,,不执行添加操作
+        FindAndModifyOptions releaseOptions = new FindAndModifyOptions().upsert(false).returnNew(true);
         ScheduleTaskConfig flowDisposition = mongoTemplate.findAndModify(releaseQuery, releaseUpdate, releaseOptions, ScheduleTaskConfig.class);
         return StringUtils.isEmpty(flowDisposition.getToken());
     }

+ 5 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/schedule/ScheduleTaskConfigService.java

@@ -102,7 +102,8 @@ public class ScheduleTaskConfigService {
                         }
                     }
                     taskConfig.setExpression(expression);
-                    taskConfig.setRemark(String.format("项目结算定时任务:%s", entity.getProjectOid()));
+                    taskConfig.setRemark(String.format("项目结算定时任务: 项目oid=%s,支付渠道= %s",
+                            entity.getProjectOid(), entity.getChannelType().getRemark()));
                     scheduleTaskConfigDao.save(taskConfig);
                 }
             } catch (Exception e) {
@@ -115,6 +116,9 @@ public class ScheduleTaskConfigService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 重置所有的定时任务
+     */
     private void loadAllSchedule() {
         try {
             log.info("================系统启动加载定时任务====开始===========");