修改查询订单状态

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

@@ -472,6 +472,7 @@ public class PayServiceImpl implements PayService {
         List<Map<String, Object>> tempRoutingList = new ArrayList<>();
 
         PaymentChannelEnum patType = null;
+        boolean feeFlag = false;
         for (RouteScaleDto routeScaleDto : routeScaleDtos) {
             patType = routeScaleDto.getPayType();
             Map<String, Object> routingList = new HashMap<>();
@@ -489,15 +490,23 @@ public class PayServiceImpl implements PayService {
                 routeBalanceAmount = balanceAmount.subtract(hasRouteBalanceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 routingMoney = amount.subtract(hasRouteMoney).setScale(2, BigDecimal.ROUND_HALF_UP);
             }
+
+            if (routingFee.compareTo(BigDecimal.ZERO) <= 0) {
+                continue;
+            }
+
             hasRouteAmount = hasRouteAmount.add(routingFee);
             hasRouteBalanceAmount = hasRouteBalanceAmount.add(routeBalanceAmount);
             hasRouteMoney = hasRouteMoney.add(routingMoney);
 
             routingList.put("routingMerNo", routeScaleDto.getMerNo());//分佣账户
             routingList.put("routingFee", routingFee); //分佣金额
-
-            if (routingFee.compareTo(BigDecimal.ZERO) > 0) {
-                tempRoutingList.add(routingList);
+            tempRoutingList.add(routingList);
+            if (routeScaleDto.getFeeFlag().equals("Y")) {
+                feeFlag = true;
+            }
+            if (i == routeScaleDtos.size() && !feeFlag) {
+                routeScaleDto.setFeeFlag("Y");
             }
 
             StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();

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

@@ -208,10 +208,7 @@ public class StudentOrderController extends BaseController {
 
         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));//分佣金额
@@ -219,16 +216,6 @@ public class StudentOrderController extends BaseController {
             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) {