订单撤销到仓时情况订单项中的到仓数据

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -4054,7 +4054,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         BigDecimal sumCheckWeight = BigDecimal.ZERO;
         List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderId));
         for (OrderItemDO orderItemDO : orderItemDOList) {
-            if (orderItemCheckWarehouseVOMap.containsKey(orderItemDO.getOrderItemId())){
+            if (orderItemCheckWarehouseVOMap.containsKey(orderItemDO.getOrderItemId())) {
                 OrderItemCheckWarehouseVO warehouseCheckDO = orderItemCheckWarehouseVOMap.get(orderItemDO.getOrderItemId());
                 WarehouseCheckInfoVO warehouseCheckInfoVO = warehouseCheckDO.getWarehouseCheckInfoVO();
                 orderItemDO.setCheckBrand(warehouseCheckDO.getCheckBrand());
@@ -4119,6 +4119,14 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         Integer orderStatus = orderDO.getStatus();
         Integer orderInWarehouseState = orderDO.getInWarehouseState();
         Integer orderShipmentState = orderDO.getShipmentState();
+        orderItemMapper.update(null, new LambdaUpdateWrapper<OrderItemDO>()
+                .set(OrderItemDO::getWarehouseCheckInfo, null)
+                .set(OrderItemDO::getCheckBrand, null)
+                .set(OrderItemDO::getCheckBrandType, null)
+                .set(OrderItemDO::getWarehouseCheckProdAttrIds, null)
+                .set(OrderItemDO::getCheckMaterial, null)
+                .eq(OrderItemDO::getOrderId, orderId)
+        );
         // 更新订单到仓数据，回滚订单状态
         orderMapper.update(null, new LambdaUpdateWrapper<OrderDO>()
                 .set(OrderDO::getCheckNum, 0)