|
@@ -34,6 +34,13 @@ public class SysPaymentConfigController extends BaseController {
|
|
|
if (paymentConfig != null) {
|
|
|
return failed("此分部配置已经存在");
|
|
|
}
|
|
|
+ if(StringUtils.isNotBlank(sysPaymentConfig.getHfMerNo())){
|
|
|
+ SysPaymentConfig nowConfig = sysPaymentConfigService.findPaymentConfigByMerNo(sysPaymentConfig.getHfMerNo());
|
|
|
+ if(nowConfig != null){
|
|
|
+ return failed("汇付商户号已配置,不同分部请勿配置相同商户号");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
Date nowDate = new Date();
|
|
|
sysPaymentConfig.setCreateTime(nowDate);
|
|
|
sysPaymentConfig.setUpdateTime(nowDate);
|
|
@@ -56,6 +63,13 @@ public class SysPaymentConfigController extends BaseController {
|
|
|
@PostMapping("/update")
|
|
|
@PreAuthorize("@pcs.hasPermissions('paymentConfig/update')")
|
|
|
public Object update(SysPaymentConfig sysPaymentConfig) {
|
|
|
+ if(StringUtils.isNotBlank(sysPaymentConfig.getHfMerNo())){
|
|
|
+ SysPaymentConfig nowConfig = sysPaymentConfigService.findPaymentConfigByMerNo(sysPaymentConfig.getHfMerNo());
|
|
|
+ if(nowConfig != null && !nowConfig.getOrganId().equals(sysPaymentConfig.getOrganId())){
|
|
|
+ return failed("汇付商户号已配置,不同分部请勿配置相同商户号");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
sysPaymentConfig.setUpdateTime(new Date());
|
|
|
sysPaymentConfigService.update(sysPaymentConfig);
|
|
|
return succeed();
|