修改开团添加是否单乐器的选项接口

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

@@ -221,6 +221,7 @@ public class UserController extends BaseController {
 //    @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openClassPay")
     public Object openClassPay(Integer id, String smsMsg, int type, int isSingle) {//1是线上 2 线下
+        //isSingle 0 单乐器 1非单乐器
         if (id == null || (isSingle > 1 || isSingle < 0) || (type == 2 && StringUtils.isEmpty(smsMsg))) {
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }

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

@@ -159,7 +159,7 @@ public class YqPayController extends BaseController {
         order.setStatus(1); //订单状态
 
         //获取分佣账户
-        Integer branchId = 1001;//默认分佣账
+        Integer branchId = 1002;//默认分佣账
         Account routingAccount = accountService.getRoutingAccount(branchId, amount);
 
         order.setAccount(routingAccount.getSellerNo());
@@ -348,7 +348,7 @@ public class YqPayController extends BaseController {
 
         String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
         //获取分佣账户
-        Integer branchId = 1001;//默认分佣账户;
+        Integer branchId = 1002;//默认分佣账户;
         Account routingAccount = accountService.getRoutingAccount(branchId, amount);
 
         Order order = renewalsService.addRenewalsOrder(renewals, amount, orderNo, pickCourses, routingAccount, remark);

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -144,19 +144,17 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         String returnUrl = this.returnHost + "/#/payment?userId=" + order.getUserId();//支付后返回页面
 
         if (school != null) {
-            returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId()  + "&cityId=" + school.getCityId();//支付后返回页面
+            returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId() + "&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}";//支付方式配置
 
         List<Map> tempRoutingList = new ArrayList();
-        if (routingAccount.getBranchId().equals(0)) {
-            Map<String, Object> routingList = new HashMap<>();
-            routingList.put("routingMerNo", routingAccount.getSellerNo());//分佣账户
-//            routingList.put("routingFee", order.getAmount()); //分佣金额
-            routingList.put("routingFee", order.getAmount().subtract((order.getAmount().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
-            tempRoutingList.add(routingList);
-        }
+        Map<String, Object> routingList = new HashMap<>();
+        routingList.put("routingMerNo", routingAccount.getSellerNo());//分佣账户
+//      routingList.put("routingFee", order.getAmount()); //分佣金额
+        routingList.put("routingFee", order.getAmount().subtract((order.getAmount().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
+        tempRoutingList.add(routingList);
 
         /*订单信息*/
         String orderBody = "大雅乐盟培训课程";
@@ -173,17 +171,15 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         resultMap.put("merMerOrderNo", order.getOrderNo()); //商户订单号
         resultMap.put("orderSubject", orderSubject); //订单标题
         resultMap.put("returnUrl", returnUrl); //前台页面地址
-        if (routingAccount.getBranchId().equals(0)) {
-            resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
-        }
+        resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
         Map rqMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
         rqMap.put("host", payUrl);
         return rqMap;
     }
 
     @Override
-    public List<Order> getOrderByClassId(Integer classId, Integer type,String voicyPart) {
-        return orderDao.getOrderByClassId(classId, type,voicyPart);
+    public List<Order> getOrderByClassId(Integer classId, Integer type, String voicyPart) {
+        return orderDao.getOrderByClassId(classId, type, voicyPart);
     }
 
     public static void main(String[] args) {
@@ -214,8 +210,8 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
     }
 
     @Override
-    public Order findRegOrderByStatus(Integer userId, Integer status){
-       return  orderDao.findRegOrderByStatus(userId,status);
+    public Order findRegOrderByStatus(Integer userId, Integer status) {
+        return orderDao.findRegOrderByStatus(userId, status);
     }