Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test

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

@@ -49,8 +49,10 @@ public class OrderWeightServiceImpl implements OrderWeightService {
         if(CollectionUtils.isEmpty(orderGoodsList)){
             return  OrderExtractWeightVO.builder().transportWeight(orderInfo.getTransportWeight())
                     .truckDemand(orderInfo.getTruckDemand())
-                    .ownCarryWeight(orderInfo.getOwnCarryWeight()).platformCarryWeight(orderInfo.getPlatformCarryWeight())
-                    .ownCanExtractWeight(orderInfo.getOwnCarryWeight()).platCanExtractWeight(orderInfo.getPlatformCarryWeight())
+                    .ownCarryWeight(orderInfo.getOwnCarryWeight())
+                    .platformCarryWeight(orderInfo.getPlatformCarryWeight())
+                    .ownCanExtractWeight(orderInfo.getOwnCarryWeight())
+                    .platCanExtractWeight(orderInfo.getPlatformCarryWeight())
                     .build();
         }
         //已发布的自有车辆吨数
@@ -82,6 +84,8 @@ public class OrderWeightServiceImpl implements OrderWeightService {
                     .truckDemand(orderInfo.getTruckDemand())
                     .platformCarryWeight(orderInfo.getPlatformCarryWeight())
                     .platCanExtractWeight(orderInfo.getTransportWeight().subtract(platOrderGoodsWeight))
+                    .ownCarryWeight(BigDecimal.ZERO)
+                    .ownCanExtractWeight(BigDecimal.ZERO)
                     .build();
         }
         if(Objects.equals(orderInfo.getTruckDemand(), TruckDemandEnum.TruckType.OWNER_CAR.getCode())){
@@ -89,6 +93,8 @@ public class OrderWeightServiceImpl implements OrderWeightService {
                     .truckDemand(orderInfo.getTruckDemand())
                     .ownCarryWeight(orderInfo.getOwnCarryWeight())
                     .ownCanExtractWeight(orderInfo.getTransportWeight().subtract(ownOrderGoodsWeight))
+                    .platformCarryWeight(BigDecimal.ZERO)
+                    .platCanExtractWeight(BigDecimal.ZERO)
                     .build();
         }
         if(Objects.equals(orderInfo.getTruckDemand(), TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())){