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

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

@@ -168,6 +168,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        BigDecimal residueWeight = this.calcOrderGoodsResidueWeight(orderGoodsVO.getExtractWeight(),
+                orderGoodsVO.getAlreadyTransportWeight());
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
@@ -176,7 +178,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setUnloadEndTime(orderInfoFeign.getUnloadEndTime());
         orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
-        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
+        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(residueWeight) > 0 ? BigDecimal.ZERO : residueWeight);
         //货源地信息
         orderGoodsVO.setSendContact(orderInfoFeign.getSendContact());
         orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone());
@@ -245,9 +247,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                         item.setOverOrderWeight(1);
                     }
                 }
-                item.setResidueTransportWeight(item.getExtractWeight()
-                        .subtract(Objects.nonNull(item.getAlreadyTransportWeight())
-                                ?item.getAlreadyTransportWeight():BigDecimal.ZERO));
+                item.setResidueTransportWeight(calcOrderGoodsResidueWeight(item.getExtractWeight(),item.getAlreadyTransportWeight()));
             });
         }
         return page;
@@ -414,6 +414,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     @Override
     public List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(String orderNo) {
         List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+
+        if(CollectionUtils.isNotEmpty(list)){
+            list.forEach(item-> item.setResidueTransportWeight(this.calcOrderGoodsResidueWeight(item.getExtractWeight(),
+                    item.getAlreadyTransportWeight())));
+        }
         return orderGoodsStruct.convertList(list);
     }
 
@@ -828,9 +833,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     public OrderGoodsEditVO findOrderGoodsById(Integer id) {
         OrderGoodsEditVO result = new OrderGoodsEditVO();
         OrderGoodsVO orderGoodsVO = orderGoodsDao.findOrderGoodsById(id);
-        orderGoodsVO.setResidueTransportWeight(orderGoodsVO.getExtractWeight()
-                .subtract(Objects.nonNull(orderGoodsVO.getAlreadyTransportWeight())
-                        ?orderGoodsVO.getAlreadyTransportWeight():BigDecimal.ZERO));
+        orderGoodsVO.setResidueTransportWeight(
+                this.calcOrderGoodsResidueWeight(orderGoodsVO.getExtractWeight(),orderGoodsVO.getAlreadyTransportWeight())
+        );
 
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);