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

sql/v2.1/20240904.sql

@@ -12,6 +12,9 @@ alter table `ecw_order_consignee`
 alter table `ecw_order`
     add column `pick_state` tinyint DEFAULT 0 COMMENT '提货状态：0 未提货 1 部分提货 2 已提货';
 alter table `ecw_order`
-    add column `pick_ratio` int DEFAULT 0 COMMENT '提货率';
+    add column `pick_ratio` decimal(4,2) DEFAULT '0.00' COMMENT '提货率';
 alter table `ecw_order`
-    add column `pick_num` int DEFAULT 0 COMMENT '提货箱数';
+    add column `pick_num` int DEFAULT 0 COMMENT '提货箱数';
\ No newline at end of file
+
+-- 批量刷新订单提货数量、提货率、提货状态
+update ecw_order t LEFT JOIN (select a.order_id,sum(a.pick_num) as pickNum from ecw_order_pickup a where a.deleted=0 GROUP BY a.order_id) t1 on t.order_no=t1.order_id set t.pick_num=t1.pickNum,t.pick_ratio=ROUND(t1.pickNum/t.sum_num,2)*100,t.pick_state=(case when t1.pickNum is null then 0 when t1.pickNum=t.sum_num then 3 else 2 end);
\ No newline at end of file

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

@@ -211,7 +211,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
         List<OrderPickupDO> orderPickupDOS = orderPickupMapper.selectList(OrderPickupDO::getOrderId, orderNo);
         int pickedSum = orderPickupDOS.stream().mapToInt(OrderPickupDO::getPickNum).sum();
         int allPickNum = pickedSum + pickNum;
-        BigDecimal pickRatio = new BigDecimal(allPickNum / sumNum);
+        BigDecimal pickRatio = new BigDecimal((double) (allPickNum / sumNum) * 100 );
         pickRatio.setScale(2, RoundingMode.HALF_UP);
         orderService.update(new LambdaUpdateWrapper<OrderDO>()
                 .set(OrderDO::getPickNum, allPickNum)