Merge branch 'v22.7_order_delay_20240827' into dev

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

@@ -44,9 +44,11 @@ public class OrderWeightServiceImpl implements OrderWeightService {
 
         List<OrderGoods> orderGoodsList = orderGoodsDao.listByField(OrderGoods::getOrderNo, orderNo);
         if(CollectionUtils.isEmpty(orderGoodsList)){
-            BigDecimal canExtractWeight = Objects.nonNull(orderInfo.getPlatformCarryWeight())?
+            BigDecimal canExtractWeight = Objects.nonNull(orderInfo.getPlatformCarryWeight())
+                     && orderInfo.getPlatformCarryWeight().compareTo(BigDecimal.ZERO) >0?
                     orderInfo.getPlatformCarryWeight():BigDecimal.ZERO.add(
-                            Objects.nonNull(orderInfo.getOwnCarryWeight())?
+                            Objects.nonNull(orderInfo.getOwnCarryWeight())
+                                    && orderInfo.getOwnCarryWeight().compareTo(BigDecimal.ZERO) >0?
                     orderInfo.getOwnCarryWeight():BigDecimal.ZERO);
             return  OrderExtractWeightVO.builder().transportWeight(orderInfo.getTransportWeight())
                     .truckDemand(orderInfo.getTruckDemand())
@@ -143,11 +145,12 @@ public class OrderWeightServiceImpl implements OrderWeightService {
 
     @Override
     public BigDecimal getAlreadyWeight(BigDecimal transportWeight, String orderNo) {
+        BigDecimal alreadyWeight = BigDecimal.ZERO;    //该订单下已经拉运的重量
+
         List<OrderChild> orderChildList = orderChildDao.listByField(OrderChild::getOrderNo, orderNo);
         if(CollectionUtils.isEmpty(orderChildList)){
-            return transportWeight;
+            return alreadyWeight;
         }
-        BigDecimal alreadyWeight = BigDecimal.ZERO;    //该订单下已经拉运的重量
 
         for (OrderChild child : orderChildList) {
             if(child.getStatus() > OrderChildEnum.Status.COMPLETE.getCode()){