Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -275,17 +275,21 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         List<OrderGoods> orderGoodsList = null;
         BigDecimal orderGoodsResidueWeight = BigDecimal.ZERO;
         String residueWeight = orderInfoFeign.getResidueWeight();
-
+        BigDecimal ans = new BigDecimal(residueWeight);
         switch (optionType) {
             case "1":
-                return new BigDecimal(residueWeight);
+                return ans;
             case "2":
                 orderGoodsList  = orderGoodsDao.getOrderGoodsListByOrderNoAndStatus(orderNo);
                 if (CollectionUtil.isNotEmpty(orderGoodsList)) {
                     orderGoodsResidueWeight = orderGoodsList.stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
-                return orderGoodsResidueWeight.add(new BigDecimal(residueWeight));
-
+                ans = orderGoodsResidueWeight.add(new BigDecimal(residueWeight));
+                if (ans.compareTo(new BigDecimal("35")) <= 0) {
+                    return BigDecimal.ZERO;
+                } else {
+                    return ans.subtract(new BigDecimal("35"));
+                }
             case "3":
                 List<OrderChild> orderChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
                 BigDecimal childResidueWeight = BigDecimal.ZERO;
@@ -297,12 +301,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 if (CollectionUtil.isNotEmpty(orderGoodsList)) {
                     orderGoodsResidueWeight = orderGoodsList.stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
-                return new BigDecimal(residueWeight).add(orderGoodsResidueWeight).add(childResidueWeight);
-
+                ans = ans.add(orderGoodsResidueWeight).add(childResidueWeight);
+                if (ans.compareTo(new BigDecimal("35")) <= 0) {
+                    return BigDecimal.ZERO;
+                } else {
+                    return ans.subtract(new BigDecimal("35"));
+                }
             default:throw new RuntimeException("参数错误");
         }
 
-
     }