Merge remote-tracking branch 'origin/master'

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

@@ -293,11 +293,11 @@ public class PayServiceImpl implements PayService {
         BigDecimal hasRouteMoney = BigDecimal.ZERO;
         List<Map<String, Object>> tempRoutingList = new ArrayList<>();
 
-        PaymentChannelEnum patType = null;
+        PaymentChannelEnum payType = null;
         boolean feeFlag = false;
         Set<String> routingMerNoSet = new HashSet<>();
         for (RouteScaleDto routeScaleDto : routeScaleDtos) {
-            patType = routeScaleDto.getPayType();
+            payType = routeScaleDto.getPayType();
             Map<String, Object> routingList = new HashMap<>();
             i++;
 
@@ -347,7 +347,7 @@ public class PayServiceImpl implements PayService {
             throw new BizException("调用支付接口失败");
         }
 
-        if (patType.equals(PaymentChannelEnum.YQPAY)) {
+        if (payType.equals(PaymentChannelEnum.YQPAY)) {
             if (tempRoutingList.size() == 1 && YqPayUtil.merNo.equals(tempRoutingList.get(0).get("routingMerNo").toString())) {
                 tempRoutingList = null;
             }
@@ -358,7 +358,7 @@ public class PayServiceImpl implements PayService {
         String routingMerNos = String.join(",", routingMerNoSet);
 
         unionPay.put("orderNo", orderNo);
-        unionPay.put("type", patType.getCode());
+        unionPay.put("type", payType.getCode());
         unionPay.put("payMap", payMap);
         unionPay.put("routingMerNos", routingMerNos);
         return unionPay;

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

@@ -107,7 +107,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
             BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO;
             for (SellOrder sellOrder : sellOrderList) {
-                if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getParentGoodsId())) {
+                if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getGoodsId())) {
                     continue;
                 }
                 BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
@@ -214,7 +214,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 BigDecimal hasRouteSellOrderExpectAmount = BigDecimal.ZERO;
                 BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO;
                 for (SellOrder sellOrder : sellOrderList) {
-                    if (!goods.getId().equals(sellOrder.getParentGoodsId()) && !goods.getId().equals(sellOrder.getParentGoodsId())) {
+                    if (!goods.getId().equals(sellOrder.getParentGoodsId()) && !goods.getId().equals(sellOrder.getGoodsId())) {
                         continue;
                     }
                     BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;

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

@@ -151,7 +151,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 
                 BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
                 for (SellOrder sellOrder : sellOrderList) {
-                    if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getParentGoodsId())) {
+                    if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getGoodsId())) {
                         continue;
                     }
                     BigDecimal sellOrderActualAmount = BigDecimal.ZERO;

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

@@ -615,7 +615,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             BigDecimal hasRouteSellOrderExpectAmount = BigDecimal.ZERO;
             BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO;
             for (SellOrder sellOrder : sellOrderList) {
-                if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getParentGoodsId())) {
+                if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getGoodsId())) {
                     continue;
                 }
                 BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;