TRX 1 рік тому
батько
коміт
5b7b4e104a

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/ProjectMainPaySettingModel.java

@@ -24,6 +24,9 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 public class ProjectMainPaySettingModel {
 
+    @Schema(description = "所属项目oid")
+    private String projectOid;
+
     @Schema(description = "选择的机构主支付配置数据id")
     private String paySettingInfoId;
 

+ 4 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectMainPaySettingService.java

@@ -121,7 +121,7 @@ public class ProjectMainPaySettingService extends SuperService {
 
         projectMainPaySettingDao.save(mainPaySetting);
         // 加入结算定时任务
-//        scheduleTaskConfigService.initProjectSettlementRulesTask(mainPaySetting);
+        scheduleTaskConfigService.initProjectSettlementRulesTask(mainPaySetting);
         return ResultContent.buildSuccess();
     }
 
@@ -134,7 +134,9 @@ public class ProjectMainPaySettingService extends SuperService {
     public ResultContent<ProjectMainPaySettingModel> getMainPaySetting(String projectOid, PaymentType paymentType) {
         ProjectMainPaySetting mainPaySetting = projectMainPaySettingDao.findTopByProjectOidAndChannelType(
                 projectOid, paymentType);
-        return ResultContent.buildSuccess(toMainModel(mainPaySetting));
+        ProjectMainPaySettingModel model = toMainModel(mainPaySetting);
+        model.setProjectOid(projectOid);
+        return ResultContent.buildSuccess(model);
     }
 
     //---------------------------项目上的灵活 分账配置 start -----------------------

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

@@ -61,7 +61,7 @@ public class ScheduleTaskConfigService {
                 if (StringUtils.isNotEmpty(lockKey)) {
                     String aboutDataId = entity.getProjectOid() + "_" + entity.getChannelType().name();
                     ScheduleTaskConfig taskConfig = scheduleTaskConfigDao.findTopByAboutDataId(aboutDataId);
-                    if (ObjectUtils.isNotEmpty(taskConfig)) {
+                    if (ObjectUtils.isEmpty(taskConfig)) {
                         taskConfig = new ScheduleTaskConfig();
                     }
                     taskConfig.setAboutDataId(aboutDataId);