update

mec-biz/src/main/java/com/ym/mec/biz/service/SysPaymentConfigService.java

@@ -8,6 +8,14 @@ import com.ym.mec.common.service.BaseService;
 import java.util.List;
 
 public interface SysPaymentConfigService extends BaseService<Integer, SysPaymentConfig> {
+	
+
+    /**
+     * 根据分部id获取配置
+     * @param organId
+     * @return
+     */
+    SysPaymentConfig findPaymentConfigByOrganId(Integer organId);
 
     /**
      * 根据分部id获取配置

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysPaymentConfigServiceImpl.java

@@ -30,6 +30,11 @@ public class SysPaymentConfigServiceImpl extends BaseServiceImpl<Integer, SysPay
     }
 
     @Override
+	public SysPaymentConfig findPaymentConfigByOrganId(Integer organId) {
+		return sysPaymentConfigDao.findPaymentConfigByOrganId(organId);
+	}
+
+	@Override
     public SysPaymentConfig findPaymentConfigByOrganId(PaymentChannelEnum paymentChannel, Integer organId) {
     	SysPaymentConfig sysPaymentConfig =  sysPaymentConfigDao.findPaymentConfigByOrganId(organId);
     	

mec-web/src/main/java/com/ym/mec/web/controller/SysPaymentConfigController.java

@@ -44,16 +44,10 @@ public class SysPaymentConfigController extends BaseController {
         if (sysPaymentConfig.getOrganId() == null) {
             return failed("请选择分部");
         }
-        SysPaymentConfig paymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(sysPaymentConfig.getPayType(), sysPaymentConfig.getOrganId());
+        SysPaymentConfig paymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(sysPaymentConfig.getOrganId());
         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);
@@ -125,7 +119,7 @@ public class SysPaymentConfigController extends BaseController {
         if (StringUtils.isBlank(config.getTypeRouteScale())) {
             return failed("分润配置不能为空");
         }
-        SysPaymentConfig paymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(config.getPayType(), config.getOrganId());
+        SysPaymentConfig paymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(config.getOrganId());
         if (paymentConfig != null && StringUtils.isNotBlank(paymentConfig.getTypeRouteScale())) {
             return failed("此分部配置存在,请核查");
         }
@@ -135,7 +129,6 @@ public class SysPaymentConfigController extends BaseController {
             paymentConfig.setUpdateTime(nowDate);
             sysPaymentConfigService.update(paymentConfig);
         } else {
-            config.setPayType(PaymentChannelEnum.ADAPAY);
             config.setType(2);
             config.setCreateTime(nowDate);
             config.setUpdateTime(nowDate);