修改支付返回地址

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -132,7 +132,7 @@ public class YqPayController extends BaseController {
         order.setStatus(1); //订单状态
 
         //获取支付成功跟支付中的订单数
-        int branchId = order.getBranchId();
+        Integer branchId = 1001;//order.getBranchId();
         int payOrderNums = orderService.getPayOrderNums();
         //分佣账户（1、每10笔，前四笔收入私户 2、私户每个商户最多收款400万）
         if ((payOrderNums + 1) % 10 <= 4) { //私人账户
@@ -148,11 +148,13 @@ public class YqPayController extends BaseController {
         BigDecimal HasRouting = account.getHasRouting().add(order.getAmount());
         account.setHasRouting(HasRouting);
 
-        Map<String, Object> routingList = new LinkedHashMap<String, Object>();
-        routingList.put("routingMerNo", routingMerNo);//分佣账户
-        routingList.put("routingFee", order.getAmount()); //分佣金额
         List<Map> tempRoutingList = new ArrayList();
-        tempRoutingList.add(routingList);
+        if (branchId.equals(0)) {
+            Map<String, Object> routingList = new HashMap<>();
+            routingList.put("routingMerNo", routingMerNo);//分佣账户
+            routingList.put("routingFee", amount); //分佣金额
+            tempRoutingList.add(routingList);
+        }
 
         order.setUAccount(account.getId().toString());
         order.setAccount(routingMerNo);
@@ -184,7 +186,9 @@ public class YqPayController extends BaseController {
         resultMap.put("merMerOrderNo", orderNo); //商户订单号
         resultMap.put("orderSubject", orderSubject); //订单标题
         resultMap.put("returnUrl", returnUrl); //前台页面地址
-        resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
+        if (branchId.equals(0)) {
+            resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
+        }
         Map rqMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
         rqMap.put("host", payUrl);
 
@@ -247,14 +251,14 @@ public class YqPayController extends BaseController {
             return failed("报名学校不存在");
         }
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //异步通知地址
-        String returnUrl = "http://pay.dayaedu.com/#/login?schoolId=" + school.getId() + "&classId=" + pickCourses.get(0).getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
+        String returnUrl = "http://pay.dayaedu.com/#/login?schoolId=" + school.getSchoolId() + "&classId=" + pickCourses.get(0).getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
         String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置
 
         String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
 
         //获取支付成功跟支付中的订单数
-        int branchId = renewals.getBranchId();
+        Integer branchId = 1001;//renewals.getBranchId();
         int payOrderNums = orderService.getPayOrderNums();
         //分佣账户（1、每10笔，前四笔收入私户 2、私户每个商户最多收款400万）
         if ((payOrderNums + 1) % 10 <= 4) { //私人账户
@@ -270,11 +274,13 @@ public class YqPayController extends BaseController {
         BigDecimal HasRouting = account.getHasRouting().add(amount);
         account.setHasRouting(HasRouting);
 
-        Map<String, Object> routingList = new LinkedHashMap<String, Object>();
-        routingList.put("routingMerNo", routingMerNo);//分佣账户
-        routingList.put("routingFee", amount); //分佣金额
         List<Map> tempRoutingList = new ArrayList();
-        tempRoutingList.add(routingList);
+        if (branchId.equals(0)) {
+            Map<String, Object> routingList = new HashMap<>();
+            routingList.put("routingMerNo", routingMerNo);//分佣账户
+            routingList.put("routingFee", amount); //分佣金额
+            tempRoutingList.add(routingList);
+        }
 
         renewalsService.addRenewalsOrder(renewals, amount, orderNo, pickCourses, routingMerNo, account.getId(), remark);
 
@@ -295,7 +301,9 @@ public class YqPayController extends BaseController {
         resultMap.put("merMerOrderNo", orderNo); //商户订单号
         resultMap.put("orderSubject", orderSubject); //订单标题
         resultMap.put("returnUrl", returnUrl); //前台页面地址
-        resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
+        if (branchId.equals(0)) {
+            resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
+        }
         Map rqMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
         rqMap.put("host", payUrl);
         return succeed(rqMap);
@@ -453,9 +461,9 @@ public class YqPayController extends BaseController {
                 order.setPay(notifyMsg.getPayAmount());
                 order.setPayTime(new Date());
             }
-            orderService.update(order);
-            ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
-            applyInfoService.userRegister(applyInfo.getPatriarchPhone(), order.getId()); //推送mec
+            //orderService.update(order);
+            //ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
+            //applyInfoService.userRegister(applyInfo.getPatriarchPhone(), order.getId()); //推送mec
 
             msg.setCode("000000");
             msg.setMsg("success");