|
|
@@ -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 -----------------------
|