提货箱数、提货率、提货状态回填

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -190,7 +190,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
                 }
             }
         }
-        dealDeliveryRate(createReqVO.getOrderId(),num,orderDO.getSumNum(),PickStateEnum.picked.getPickState());
+        dealDeliveryRate(createReqVO.getOrderId(),0,orderDO.getSumNum(),PickStateEnum.picked.getPickState());
         // 返回
         return orderPickup.getId();
     }
@@ -210,10 +210,11 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
     private void dealDeliveryRate(String orderNo,Integer pickNum,Integer sumNum,Integer pickState) {
         List<OrderPickupDO> orderPickupDOS = orderPickupMapper.selectList(OrderPickupDO::getOrderId, orderNo);
         int pickedSum = orderPickupDOS.stream().mapToInt(OrderPickupDO::getPickNum).sum();
-        BigDecimal pickRatio = new BigDecimal((double) (pickedSum / sumNum) * 100 );
+        int allPickNum = pickedSum + pickNum;
+        BigDecimal pickRatio = new BigDecimal((double) (allPickNum / sumNum) * 100 );
         pickRatio.setScale(2, RoundingMode.HALF_UP);
         orderService.update(new LambdaUpdateWrapper<OrderDO>()
-                .set(OrderDO::getPickNum, pickedSum)
+                .set(OrderDO::getPickNum, allPickNum)
                 .set(OrderDO::getPickRatio, pickRatio)
                 .set(OrderDO::getPickState,pickState)
                 .eq(OrderDO::getOrderNo,orderNo)
@@ -534,7 +535,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
                         }
                     }
                 }
-                dealDeliveryRate(createReqVO.getOrderId(),num,orderDO.getSumNum(),PickStateEnum.picked.getPickState());
+                dealDeliveryRate(createReqVO.getOrderId(),0,orderDO.getSumNum(),PickStateEnum.picked.getPickState());
             }
         }
     }