Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -252,6 +252,7 @@ public class UserController extends BaseController {
 				}
 				sysUser.setImToken(register.getToken());
 				sysUserService.refreshImToken(sysUser);
+				return succeed(register.getToken());
 			}
 		}
 		return failed();

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

@@ -69,13 +69,13 @@ public class PayServiceImpl implements PayService {
         }
 
         //支付通道决策
-        Map<String,Object> unionPay = new HashMap<>();
+        Map<String, Object> unionPay = new HashMap<>();
         SysAccount routingAccount = getRoutingAccount(company, amount);
         PaymentChannelTypeEnum paymentChannelType = PaymentChannelTypeEnum.COM;
         if (routingAccount.getType().equals("PER")) {
             paymentChannelType = PaymentChannelTypeEnum.PER;
         }
-        Map<String,Object> payMap = null;
+        Map<String, Object> payMap = null;
         String type = null;
         if (routingAccount.getChannel().equals("YQPAY")) {
             payMap = YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routingAccount.getMerNo(), routingAccount.getRoutingMerNo());
@@ -103,15 +103,15 @@ public class PayServiceImpl implements PayService {
         }
 
         //支付通道决策
-        Map<String,Object> unionPay = new HashMap<>();
+        Map<String, Object> unionPay = new HashMap<>();
         Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId);
         List<SysAccount> accounts = getRoutingAccount(routingFee, company);
         SysAccount routingAccount = accounts.get(0);
 
-        Map<String,Object> payMap = null;
+        Map<String, Object> payMap = null;
         String type = null;
         if (routingAccount.getChannel().equals("YQPAY")) {
-            List<Map<String,Object>> tempRoutingList = new ArrayList();
+            List<Map<String, Object>> tempRoutingList = new ArrayList();
             for (SysAccount account : accounts) {
                 Map<String, Object> routingList = new HashMap<>();
                 routingList.put("routingMerNo", account.getRoutingMerNo());//分佣账户
@@ -136,7 +136,7 @@ public class PayServiceImpl implements PayService {
         unionPay.put("payMap", payMap);
         unionPay.put("routingFee", routingFee);
         unionPay.put("routingMerNos", routingMerNos);
-        unionPay.put("routingOrganId",accounts.get(0).getRoutingOrganId());
+        unionPay.put("routingOrganId", accounts.get(0).getRoutingOrganId());
         return unionPay;
     }
 
@@ -149,14 +149,18 @@ public class PayServiceImpl implements PayService {
                 company = "yaming";
             }
         }
+        if (receiver.equals("sdaya")) {
+            company = "sdaya";
+            receiver = null;
+        }
 
         //支付通道决策
-        Map<String,Object> unionPay = new HashMap<>();
+        Map<String, Object> unionPay = new HashMap<>();
         Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId, receiver);
         List<SysAccount> accounts = getRoutingAccount(routingFee, company);
         SysAccount routingAccount = accounts.get(0);
 
-        Map<String,Object> payMap = null;
+        Map<String, Object> payMap = null;
         String type = null;
         if (routingAccount.getChannel().equals("YQPAY")) {
             List<Map<String, Object>> tempRoutingList = new ArrayList();
@@ -184,7 +188,7 @@ public class PayServiceImpl implements PayService {
         unionPay.put("payMap", payMap);
         unionPay.put("routingFee", routingFee);
         unionPay.put("routingMerNos", routingMerNos);
-        unionPay.put("routingOrganId",accounts.get(0).getRoutingOrganId());
+        unionPay.put("routingOrganId", accounts.get(0).getRoutingOrganId());
         return unionPay;
     }
 

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

@@ -160,7 +160,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 			Map<String, Object> payMap = payService.getPayMap(tenantPaymentOrder.getExpectAmount(), tenantPaymentOrder.getOrderNo(), baseApiUrl
 					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/api-teacher/teacherOrder/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
-					"商户入驻", "商户充值", userId, classFee, organId);
+					"商户入驻", "商户充值", userId, classFee, organId,"sdaya");
 
 			Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
 			tenantPaymentOrder.setComAmount(routingFee.get("COM"));