Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -249,7 +249,7 @@ public class PayServiceImpl implements PayService {
         List<RouteScaleDto> routeScaleDtos = null;
         //使用配置开关
         if (usePaymentConfig.equals("0")) {
-            routeScaleDtos = noUsePaymentConfig(organId, amount);
+            routeScaleDtos = noUsePaymentConfig(amount);
         }
 
         //根据金额获取分润
@@ -268,12 +268,12 @@ public class PayServiceImpl implements PayService {
         return getPayRoute(amount, balanceAmount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routeScaleDtos);
     }
 
-    private List<RouteScaleDto> noUsePaymentConfig(Integer organId, BigDecimal amount) {
+    private List<RouteScaleDto> noUsePaymentConfig(BigDecimal amount) {
         String paymentChannel = sysConfigDao.findConfigValue("payment_channel");
         List<RouteScaleDto> routeScaleDtos = new ArrayList<>();
         RouteScaleDto routeScaleDto = new RouteScaleDto();
         routeScaleDto.setAmount(amount);
-        routeScaleDto.setOrganId(organId);
+        routeScaleDto.setOrganId(ConfigInit.organId);
         routeScaleDto.setScale(100);
         if (paymentChannel.equals("YQPAY")) {
             routeScaleDto.setMerNo(YqPayUtil.merNo);
@@ -289,22 +289,20 @@ public class PayServiceImpl implements PayService {
 
     private List<RouteScaleDto> getPaymentConfigChannel(Integer organId, BigDecimal amount) {
         SysPaymentConfig paymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(organId);
-        if (paymentConfig == null || StringUtils.isBlank(paymentConfig.getRouteScale())) {
-            String paymentChannel = sysConfigDao.findConfigValue("payment_channel");
-            if (paymentConfig != null) {
-                paymentChannel = paymentConfig.getPayType().getCode();
-            }
+        if (paymentConfig == null) {
+            return noUsePaymentConfig(amount);
+        }
+        if (StringUtils.isBlank(paymentConfig.getRouteScale())) {
             List<RouteScaleDto> routeScaleDtos = new ArrayList<>();
             RouteScaleDto routeScaleDto = new RouteScaleDto();
             routeScaleDto.setAmount(amount);
             routeScaleDto.setOrganId(organId);
             routeScaleDto.setScale(100);
-            if (paymentChannel.equals("YQPAY")) {
-                routeScaleDto.setMerNo(YqPayUtil.merNo);
-                routeScaleDto.setPayType(PaymentChannelEnum.YQPAY);
+            routeScaleDto.setPayType(paymentConfig.getPayType());
+            if (paymentConfig.getPayType().equals(PaymentChannelEnum.YQPAY)) {
+                routeScaleDto.setMerNo(paymentConfig.getYqMerNo());
             } else {
-                routeScaleDto.setMerNo(ConfigInit.merNo);
-                routeScaleDto.setPayType(PaymentChannelEnum.ADAPAY);
+                routeScaleDto.setMerNo(paymentConfig.getHfMerNo());
             }
             routeScaleDto.setFeeFlag("Y");
             routeScaleDtos.add(routeScaleDto);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/ConfigInit.java

@@ -8,7 +8,7 @@ public class ConfigInit {
 
 
     private static ConfigInit instance;
-    public final static Integer organId = 46; //商户对应的分部
+    public final static Integer organId = 16; //商户对应的分部
     public final static String merNo = "B09767221"; //商户对应的分部
     public final static String appId = "app_756972d1-882e-44c6-9f52-e6a6b93c8756";