Merge branch 'v4.9_create_goods_child_20230918' into test

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

@@ -926,15 +926,9 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 更新货单数据
      */
     private void updateOrderGoodsAmount(OrderGoods orderGoods, BigDecimal weight){
-        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
+        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo());
 
-        Integer status = orderGoods.getOrderGoodsStatus();
-        if (count == 0){
-            status = OrderGoodsStatusEnum.Status.PAYING.getCode();
-        }
-        else {
-            status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
-        }
+        Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
 
         orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), weight, status);
     }
@@ -962,15 +956,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif){
         if (dif.compareTo(BigDecimal.ZERO) == 0){return;}
 
-        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
+        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo());
 
-        Integer status = orderGoods.getOrderGoodsStatus();
-        if (count == 0){
-            status = OrderGoodsStatusEnum.Status.PAYING.getCode();
-        }
-        else {
-            status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
-        }
+        Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
 
         orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, status);
     }
@@ -1010,7 +998,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (count > 1) {return;}
 
         if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) <= 0){
-            orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+            orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.SUCCESS.getCode());
         }
 
     }