update 分润设置

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

@@ -472,7 +472,6 @@ public class PayServiceImpl implements PayService {
         List<Map<String, Object>> tempRoutingList = new ArrayList<>();
 
         PaymentChannelEnum patType = null;
-        boolean hasFeeFlag = false;
         for (RouteScaleDto routeScaleDto : routeScaleDtos) {
             patType = routeScaleDto.getPayType();
             Map<String, Object> routingList = new HashMap<>();
@@ -494,25 +493,17 @@ public class PayServiceImpl implements PayService {
             hasRouteBalanceAmount = hasRouteBalanceAmount.add(routeBalanceAmount);
             hasRouteMoney = hasRouteMoney.add(routingMoney);
 
-            if (routingFee.compareTo(BigDecimal.ZERO) <= 0) {
-                continue;
-            }
-            if(routeScaleDto.getFeeFlag().equals("Y")){
-                hasFeeFlag = true;
-            }
             routingList.put("routingMerNo", routeScaleDto.getMerNo());//分佣账户
             routingList.put("routingFee", routingFee); //分佣金额
 
-            String feeFlag = routeScaleDto.getFeeFlag();
-            tempRoutingList.add(routingList);
-            if (i == routeScaleDtos.size() && !hasFeeFlag) {
-                feeFlag = "Y";
+            if (routingFee.compareTo(BigDecimal.ZERO) > 0) {
+                tempRoutingList.add(routingList);
             }
 
             StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
             studentPaymentRouteOrder.setOrderNo(orderNo);
             studentPaymentRouteOrder.setRouteOrganId(routeScaleDto.getOrganId());
-            studentPaymentRouteOrder.setFeeFlag(feeFlag);
+            studentPaymentRouteOrder.setFeeFlag(routeScaleDto.getFeeFlag());
             studentPaymentRouteOrder.setRouteAmount(routingMoney);
             studentPaymentRouteOrder.setRouteBalanceAmount(routeBalanceAmount);
             studentPaymentRouteOrder.setMerNo(routeScaleDto.getMerNo());

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -201,21 +201,34 @@ public class StudentOrderController extends BaseController {
         paymentParams.put("app_id", ConfigInit.appId);
         paymentParams.put("order_no", orderNo);
         paymentParams.put("pay_channel", payChannel);
-        paymentParams.put("pay_amt", payAmount.setScale(2,BigDecimal.ROUND_HALF_UP));
+        paymentParams.put("pay_amt", payAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
         paymentParams.put("goods_title", orderSubject);
         paymentParams.put("goods_desc", orderBody);
         paymentParams.put("time_expire", timeExpire);
 
         List<StudentPaymentRouteOrder> routeOrders = studentPaymentRouteOrderDao.getRouteOrders(orderNo);
         List<Map<String, Object>> divMembers = new ArrayList<>();
+        boolean feeFlag = false;
+        int i = 0;
         for (StudentPaymentRouteOrder routeOrder : routeOrders) {
+            i++;
             Map<String, Object> divMember = new HashMap<>();
             divMember.put("member_id", routeOrder.getMerNo());//分佣账户
-            divMember.put("amount", routeOrder.getRouteAmount().setScale(2,BigDecimal.ROUND_HALF_UP));//分佣金额
-            divMember.put("fee_flag",routeOrder.getFeeFlag());
+            divMember.put("amount", routeOrder.getRouteAmount().setScale(2, BigDecimal.ROUND_HALF_UP));//分佣金额
+            divMember.put("fee_flag", routeOrder.getFeeFlag());
             if (routeOrder.getMerNo().equals(ConfigInit.merNo)) {
                 divMember.put("member_id", 0);
             }
+            if (routeOrder.getRouteAmount().compareTo(BigDecimal.ZERO) <= 0) {
+                continue;
+            }
+            if (routeOrder.getFeeFlag().equals("Y")) {
+                feeFlag = true;
+            }
+            if (i == routeOrders.size() && !feeFlag) {
+                divMember.put("fee_flag", "Y");
+            }
+
             divMembers.add(divMember);
         }
         if (divMembers.size() > 0) {