更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/PayConfigParam.java

@@ -43,7 +43,7 @@ public class PayConfigParam {
     @Schema(description = "支付产品", required = true)
     private PaymentType channelType;
 
-    @Schema(description = "是否是默认的")
+    @Schema(description = "账户类型,如：true：主账户  false:子账户")
     private Boolean isDefault = Boolean.FALSE;
 
     @Schema(description = "是否可用")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/paySetting/ProjectPaySettingController.java

@@ -83,6 +83,9 @@ public class ProjectPaySettingController {
     @Operation(summary = "账户-配置字段", description = "账户-配置字段")
     @RequestMapping(value = "getFieldByConfigId", method = {RequestMethod.POST})
     public ResultContent<PayConfigFieldModel> getFieldByConfigId(@RequestBody PaymentTypeParam param) {
+        if (param.getPaymentType() == null) {
+            return ResultContent.buildFail("paymentType不能为空");
+        }
         return projectPaySettingService.getFieldByConfigId(param);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectPaySettingServiceImpl.java

@@ -253,7 +253,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
                 return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
             }
             // 支付渠道是否已存在
-            if (ObjectUtils.isNotEmpty(temp) && temp.getId().equals(projectPaySettingInfo.getId())) {
+            if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(projectPaySettingInfo.getId())) {
                 return ResultContent.buildFail(String.format("支付渠道已存在：%s", param.getChannelType().getRemark()));
             }
 
@@ -360,9 +360,9 @@ public class ProjectPaySettingServiceImpl extends SuperService {
      */
     public List<PayConfigField> getWxConfig() {
         List<PayConfigField> fields = new ArrayList<>(4);
-        fields.add(PayConfigField.builder().name("appID").key("appId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
+        fields.add(PayConfigField.builder().name("appId").key("appId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
         fields.add(PayConfigField.builder().name("商户证书序列号").key("mchSerialNo").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
-        fields.add(PayConfigField.builder().name("商户ID").key("mchId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
+//        fields.add(PayConfigField.builder().name("商户ID").key("mchId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
         fields.add(PayConfigField.builder().name("V3密钥").key("apiV3Key").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
         fields.add(PayConfigField.builder().name("证书文件").key("privateKeyFile").type(PayFieldType.File).isMust(Boolean.FALSE).build());
         fields.add(PayConfigField.builder().name("支付成功回调地址").key("notifyUrl").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(500).build());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/schedule/ScheduledTask.java

@@ -6,6 +6,8 @@ import com.zhongshu.card.server.core.dao.schedule.ScheduleTaskConfigDao;
 import com.zhongshu.card.server.core.domain.schedule.ScheduleLog;
 import com.zhongshu.card.server.core.domain.schedule.ScheduleTaskConfig;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.CronTask;
@@ -13,7 +15,6 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.PreDestroy;
 import java.util.List;
@@ -48,8 +49,8 @@ public class ScheduledTask implements SchedulingConfigurer {
 
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        registrar.setScheduler(Executors.newScheduledThreadPool(16));
-        this.registrar = registrar;
+        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(16));
+        this.registrar = taskRegistrar;
     }
 
     @PreDestroy
@@ -62,7 +63,7 @@ public class ScheduledTask implements SchedulingConfigurer {
         // 删除已经取消任务
         scheduledFutures.keySet().forEach(key -> {
             //如果为空，取消所有
-            if (Objects.isNull(tasks) || tasks.size() == 0) {
+            if (ObjectUtils.isEmpty(tasks)) {
                 scheduledFutures.get(key).cancel(false);
                 scheduledFutures.remove(key);
                 cronTasks.remove(key);
@@ -79,85 +80,86 @@ public class ScheduledTask implements SchedulingConfigurer {
             });
         });
 
-        // 添加新任务、更改执行规则任务
-        tasks.forEach(item -> {
-            String expression = item.getExpression();
-            // 任务表达式为空则跳过
-            if (StringUtils.isEmpty(expression)) {
-                return;
-            }
+        if (ObjectUtils.isNotEmpty(tasks)) {
+            // 添加新任务、更改执行规则任务
+            tasks.forEach(item -> {
+                String expression = item.getExpression();
+                // 任务表达式为空则跳过
+                if (StringUtils.isEmpty(expression)) {
+                    return;
+                }
 
-            // 任务已存在并且表达式未发生变化则跳过
-            if (scheduledFutures.containsKey(item.getAboutDataId()) && cronTasks.get(item.getAboutDataId()).getExpression().equals(expression)) {
-                return;
-            }
+                // 任务已存在并且表达式未发生变化则跳过
+                if (scheduledFutures.containsKey(item.getAboutDataId()) && cronTasks.get(item.getAboutDataId()).getExpression().equals(expression)) {
+                    return;
+                }
 
-            // 任务执行时间发生了变化，则删除该任务
-            if (scheduledFutures.containsKey(item.getAboutDataId())) {
-                scheduledFutures.get(item.getAboutDataId()).cancel(false);
-                scheduledFutures.remove(item.getAboutDataId());
-                cronTasks.remove(item.getAboutDataId());
-            }
+                // 任务执行时间发生了变化，则删除该任务
+                if (scheduledFutures.containsKey(item.getAboutDataId())) {
+                    scheduledFutures.get(item.getAboutDataId()).cancel(false);
+                    scheduledFutures.remove(item.getAboutDataId());
+                    cronTasks.remove(item.getAboutDataId());
+                }
 
-            CronTask task = new CronTask(new Runnable() {
-                @Override
-                public void run() {
-                    StopWatch stopWatch = new StopWatch("flow-unlock-task-watch-" + Thread.currentThread().getName());
-                    ScheduleLog scheduleLog = new ScheduleLog();
-                    scheduleLog.setExecuteTime(System.currentTimeMillis());
-                    scheduleLog.setExecuteTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
-                    // 执行业务逻辑
-                    try {
-                        log.info("====执行单个任务，配置ID【{}】，任务ID【{}】执行规则【{}】=======",
-                                item.getId(), item.getAboutDataId(), item.getExpression());
-                        scheduleLog.setScheduleTaskConfig(item);
-
-                        String token = scheduleTaskConfigDao.acquire(item.getId(), 10000L);
-                        boolean newLock = org.apache.commons.lang3.StringUtils.isNotEmpty(token);
-                        if (newLock) {
-                            log.info("获取到执行锁，开始执行");
-
-                            Long begin = DateUtils.getCurrentDayStartTime().getTime();
-                            Long end = DateUtils.getCurrentDayEndTime().getTime();
-                            List<ScheduleLog> existsLogs = scheduleLogDao.findByScheduleTaskConfigAndCreateTimeBetweenAndStatus(item, begin, end, ScheduleLog.STATUS_SUCESS);
-
-                            if (CollectionUtils.isEmpty(existsLogs)) {
-                                stopWatch.start("item:" + item.getAboutDataId());
-                                taskContextService.execute(item);
-                                scheduleLog.setStatus(ScheduleLog.STATUS_SUCESS);
-                                scheduleLog.setResult("执行成功");
+                CronTask cronTask = new CronTask(new Runnable() {
+                    @Override
+                    public void run() {
+                        StopWatch stopWatch = new StopWatch("flow-unlock-task-watch-" + Thread.currentThread().getName());
+                        ScheduleLog scheduleLog = new ScheduleLog();
+                        scheduleLog.setExecuteTime(System.currentTimeMillis());
+                        scheduleLog.setExecuteTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+                        // 执行业务逻辑
+                        try {
+                            log.info("====执行单个任务，配置ID【{}】，任务ID【{}】执行规则【{}】=======", item.getId(), item.getAboutDataId(), item.getExpression());
+                            scheduleLog.setScheduleTaskConfig(item);
+                            // 得到任务执行锁
+                            String token = scheduleTaskConfigDao.acquire(item.getId(), 10000L);
+                            if (StringUtils.isNotEmpty(token)) {
+                                log.info("获取到执行锁，开始执行");
+
+                                Long begin = DateUtils.getCurrentDayStartTime().getTime();
+                                Long end = DateUtils.getCurrentDayEndTime().getTime();
+                                List<ScheduleLog> existsLogs = scheduleLogDao.findByScheduleTaskConfigAndCreateTimeBetweenAndStatus(item, begin, end, ScheduleLog.STATUS_SUCESS);
+
+                                if (CollectionUtils.isEmpty(existsLogs)) {
+                                    stopWatch.start("item:" + item.getAboutDataId());
+                                    taskContextService.execute(item);
+                                    scheduleLog.setStatus(ScheduleLog.STATUS_SUCESS);
+                                    scheduleLog.setResult("执行成功");
+                                } else {
+                                    log.warn("已查询到执行结果，跳过执行,已执行成功记录数:{}", existsLogs.size());
+                                    scheduleLog.setStatus(ScheduleLog.STATUS_PASS);
+                                    scheduleLog.setResult("已查询到执行结果，跳过执行");
+                                }
                             } else {
-                                log.warn("已查询到执行结果，跳过执行,已执行成功记录数:{}", existsLogs.size());
+                                log.warn("未获取到执行锁，跳过执行");
                                 scheduleLog.setStatus(ScheduleLog.STATUS_PASS);
-                                scheduleLog.setResult("已查询到执行结果，跳过执行");
+                                scheduleLog.setResult("未获取到执行锁，跳过执行");
                             }
-                        } else {
-                            log.warn("未获取到执行锁，跳过执行");
-                            scheduleLog.setStatus(ScheduleLog.STATUS_PASS);
-                            scheduleLog.setResult("未获取到执行锁，跳过执行");
-                        }
-                    } catch (Exception e) {
-                        log.error("执行任务异常，异常信息：", e);
-                        scheduleLog.setStatus(ScheduleLog.STATUS_FAILED);
-                        scheduleLog.setException("执行出错：" + e.getStackTrace().toString());
-                    } finally {
-                        if (stopWatch.isRunning()) {
-                            stopWatch.stop();
-                            scheduleLog.setCostTime(stopWatch.getLastTaskTimeMillis());
-                            log.info("任务执行结束，耗时:{}ms", stopWatch.getLastTaskTimeMillis());
+                        } catch (Exception e) {
+                            log.error("执行任务异常，异常信息：", e);
+                            scheduleLog.setStatus(ScheduleLog.STATUS_FAILED);
+                            scheduleLog.setException("执行出错：" + e.getStackTrace().toString());
+                        } finally {
+                            if (stopWatch.isRunning()) {
+                                stopWatch.stop();
+                                scheduleLog.setCostTime(stopWatch.getLastTaskTimeMillis());
+                                log.info("任务执行结束，耗时:{}ms", stopWatch.getLastTaskTimeMillis());
+                            }
+                            // 保存执行日志
+                            scheduleLogDao.save(scheduleLog);
+                            // 释放执行锁
+                            scheduleTaskConfigDao.release(item.getId());
                         }
-
-                        scheduleLogDao.save(scheduleLog);
-                        scheduleTaskConfigDao.release(item.getId());
                     }
-                }
-            }, expression);
-
-            ScheduledFuture<?> future = registrar.getScheduler().schedule(task.getRunnable(), task.getTrigger());
-            cronTasks.put(item.getAboutDataId(), task);
-            scheduledFutures.put(item.getAboutDataId(), future);
-        });
+                }, expression);
 
+                ScheduledFuture<?> future = registrar.getScheduler().
+                        schedule(cronTask.getRunnable(), cronTask.getTrigger());
+                cronTasks.put(item.getAboutDataId(), cronTask);
+                scheduledFutures.put(item.getAboutDataId(), future);
+            });
+        }
     }
 
 }