|
@@ -126,9 +126,19 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
return ResultContent.buildSuccess();
|
|
return ResultContent.buildSuccess();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public ResultContent changeState(String id, DataState state) {
|
|
|
|
|
+ ProjectPaySetting paySetting = projectPaySettingDao.findTopById(id);
|
|
|
|
|
+ if (ObjectUtils.isEmpty(paySetting)) {
|
|
|
|
|
+ return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
|
|
|
|
|
+ }
|
|
|
|
|
+ paySetting.setState(state);
|
|
|
|
|
+ projectPaySettingDao.save(paySetting);
|
|
|
|
|
+ return ResultContent.buildSuccess();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
//-----------------------------通用配置方法 start----------------------------
|
|
//-----------------------------通用配置方法 start----------------------------
|
|
|
|
|
|
|
|
- private ProjectPaySetting getProjectPaySetting(String projectOid, PaymentType paymentType) {
|
|
|
|
|
|
|
+ public ProjectPaySetting getProjectPaySetting(String projectOid, PaymentType paymentType) {
|
|
|
return projectPaySettingDao.findTopByProjectOidAndChannelType(
|
|
return projectPaySettingDao.findTopByProjectOidAndChannelType(
|
|
|
projectOid, paymentType);
|
|
projectOid, paymentType);
|
|
|
}
|
|
}
|
|
@@ -153,6 +163,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
projectPaySetting.setProjectCode(projectOrg.getCode());
|
|
projectPaySetting.setProjectCode(projectOrg.getCode());
|
|
|
projectPaySetting.setChannelType(paymentType);
|
|
projectPaySetting.setChannelType(paymentType);
|
|
|
projectPaySetting.setPaymentChannelType(paymentType.getChannelType());
|
|
projectPaySetting.setPaymentChannelType(paymentType.getChannelType());
|
|
|
|
|
+ projectPaySetting.setState(DataState.Enable);
|
|
|
} else {
|
|
} else {
|
|
|
initUpdateEntity(projectPaySetting);
|
|
initUpdateEntity(projectPaySetting);
|
|
|
}
|
|
}
|
|
@@ -171,7 +182,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 检查是否项目是否正常付款方式
|
|
|
|
|
|
|
+ * 检查项目是否支持 指定的付款方式
|
|
|
*
|
|
*
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -179,6 +190,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
if (paymentType == null) {
|
|
if (paymentType == null) {
|
|
|
return ResultContent.buildFail("支付方式为空");
|
|
return ResultContent.buildFail("支付方式为空");
|
|
|
}
|
|
}
|
|
|
|
|
+ // 检查平台设置产品没
|
|
|
PayChannelConfig payChannelConfig = projectChannelConfigService.getProjectPayChannel(paymentType);
|
|
PayChannelConfig payChannelConfig = projectChannelConfigService.getProjectPayChannel(paymentType);
|
|
|
if (ObjectUtils.isEmpty(payChannelConfig)) {
|
|
if (ObjectUtils.isEmpty(payChannelConfig)) {
|
|
|
ResultContent.buildFail(String.format("平台未配置%s", paymentType.getChannelType().getRemark()));
|
|
ResultContent.buildFail(String.format("平台未配置%s", paymentType.getChannelType().getRemark()));
|
|
@@ -189,9 +201,14 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
paymentType.getRemark()));
|
|
paymentType.getRemark()));
|
|
|
}
|
|
}
|
|
|
if (payChannelConfig.getState() != DataState.Enable) {
|
|
if (payChannelConfig.getState() != DataState.Enable) {
|
|
|
- return ResultContent.buildFail(String.format("", payChannelConfig.getName(), payChannelConfig.getState().getRemark()));
|
|
|
|
|
|
|
+ return ResultContent.buildFail(String.format("支付产品%s%s", payChannelConfig.getName(), payChannelConfig.getState().getRemark()));
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
// 检查项目配置参数没
|
|
// 检查项目配置参数没
|
|
|
|
|
+ ProjectPaySetting paySetting = getProjectPaySetting(projectOid, paymentType);
|
|
|
|
|
+ if (ObjectUtils.isEmpty(paySetting)) {
|
|
|
|
|
+ return ResultContent.buildFail(String.format("项目为配置%s参数", paymentType.getRemark()));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return ResultContent.buildSuccess();
|
|
return ResultContent.buildSuccess();
|
|
|
}
|
|
}
|