2024-06-26-5提交

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

@@ -2595,7 +2595,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             // 判断空运已入仓订单状态如果是默认出货状态0，且无异常、无审批，那么标记为可出
             this.airShipmentStateUpdate(type, newFeeDtoList, newOrder);
 
-            setWareHouseIsZero(orderDO);
+            //setWareHouseIsZero(orderDO);
 
         }
 

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

@@ -375,6 +375,7 @@ public class OrderSpecialNeedServiceImpl extends AbstractService<OrderSpecialNee
         /*
         if (type == 1 && orderSpecialNeed.getPayType() != null
                 && orderSpecialNeed.getPayType() != 4) {*/
+
         if (type == 1 && orderSpecialNeed.getPayType() != null)
         {
             //完成入仓可多次，故先删除掉已有应收再重新生成