Merge branch 'master-fix' into release

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/warehouseIn/WarehouseInOrderCheckExceptionEvent.java

+package cn.iocoder.yudao.framework.apollo.core.event.warehouseIn;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * 入仓订单检查订单入仓异常 Event
+ *
+ * @author zhengYi
+ */
+@Data
+@AllArgsConstructor
+public class WarehouseInOrderCheckExceptionEvent {
+
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/WarehouseInOrderCheckExceptionListener.java

+package cn.iocoder.yudao.module.order.listener;
+
+import cn.iocoder.yudao.framework.apollo.core.event.warehouseIn.WarehouseInOrderCheckExceptionEvent;
+import cn.iocoder.yudao.module.order.service.orderWarehouseIn.OrderWarehouseInService;
+import lombok.AllArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 入仓订单检查订单入仓异常监听
+ *
+ * @author zhengYi
+ */
+@Component("WarehouseInOrderCheckExceptionListener")
+@AllArgsConstructor
+public class WarehouseInOrderCheckExceptionListener {
+
+    private final OrderWarehouseInService orderWarehouseInService;
+    /**
+     * 入仓订单检查订单入仓异常更新业务
+     *
+     * @param event 订单id
+     */
+    @EventListener(WarehouseInOrderCheckExceptionEvent.class)
+    public void warehouseInOrderCheckExceptionEvent(WarehouseInOrderCheckExceptionEvent event) {
+        orderWarehouseInService.finishWarehouseInWhenCheckException(event.getOrderId());
+    }
+}

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

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.framework.apollo.core.event.box.BoxCheckOrderRemoveLadin
 import cn.iocoder.yudao.framework.apollo.core.event.box.BoxOrderDynamicEstTimeEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.warehouseIn.WarehouseInOrderChangeChannelEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.warehouseIn.WarehouseInOrderChangeTransportEvent;
+import cn.iocoder.yudao.framework.apollo.core.event.warehouseIn.WarehouseInOrderCheckExceptionEvent;
 import cn.iocoder.yudao.framework.common.util.spring.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.util.bigDecimal.BigDecimalUtils;
 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
@@ -6016,8 +6017,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         orderDO.setContainerNumber(null);
         orderDO.setTidanNo(null);
         orderMapper.updateById(orderDO);
-        // TODO 这里修改完订单后需要对订单当前待处理的相关异常进行判断，是否需要重置
-        // TODO 注意：重泡货异常如果需要重置，需要调用计价接口，重新计算价格(这里计算的价格是应收总额价格)
+        // 检查入仓异常信息自动处理
+        applicationContext.publishEvent(
+                new WarehouseInOrderCheckExceptionEvent(orderDO.getOrderId()));
+
         // 处理控货信息
         handleOrderCargoControl(consignorDO, orderDO);
         // 重新计价

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInService.java

@@ -64,6 +64,14 @@ public interface OrderWarehouseInService extends IService<OrderWarehouseInDO> {
      */
     boolean finishWarehouseInWhenChangeTransportType(Long orderId);
 
+
+    /**
+     * 订单信息修改后需要检查订单入仓异常情况
+     *
+     * @param orderId
+     */
+    void finishWarehouseInWhenCheckException(Long orderId);
+
     /**
      * 订单储位接口
      *
@@ -150,7 +158,6 @@ public interface OrderWarehouseInService extends IService<OrderWarehouseInDO> {
     String updateOrUpdateApply(@Valid OrderWarehouseInUpdateApplyReqVO updateReqVO);
 
 
-
     /**
      * 出货阶段-追加申请
      *
@@ -264,11 +271,9 @@ public interface OrderWarehouseInService extends IService<OrderWarehouseInDO> {
     WarehouseInInfoVO getStatisticsFirstFinishedAfterPacked(Long orderId);
 
 
-
     List<OrderWarehouseInWithAttrVO> getOrderWarehouseInCommonAttrList(Long orderId, Long excludeOrderWarehouseInId);
 
 
-
     /**
      * 有订单，但客户类型不正确。故这里通过客户订单来修改客户状态
      */

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -1097,6 +1097,27 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         return this.finishWarehouseIn(finishReqVO);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void finishWarehouseInWhenCheckException(Long orderId) {
+
+        OrderWarehouseInFinishReqVO finishReqVO = new OrderWarehouseInFinishReqVO();
+        finishReqVO.setOrderId(orderId);
+        //不需要更新影像
+        finishReqVO.setUpdateWarehouseInUrl(false);
+        //不需要更新标签
+        finishReqVO.setUpdateLabel(false);
+        //不需要更新用户的 状态 和下一次掉入公海时间
+        finishReqVO.setUpdateCustomer(false);
+        //不需要给客户发送入仓短信
+        finishReqVO.setSendMsg(false);
+        //不需要纪录操作日志
+        finishReqVO.setIsAddOrderOperateLog(false);
+        // 不需要重订价格
+        finishReqVO.setIsResetPrice(false);
+        this.finishWarehouseIn(finishReqVO);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean finishWarehouseIn(OrderWarehouseInFinishReqVO finishReqVO) {
@@ -1318,19 +1339,20 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
             // 处理发货人异常
             //需要到仓确认，需要自动生成发货人异常信息
-            processConsignorException(finishReqVO, orderId, orderDO);
+            processConsignorException(finishReqVO.getIsUpdateCallback(), orderId, orderDO);
 
             // 重新调用计算订单价格, 订单信息和订单项信息需要重新查询，
             // 可能创建异常和修改订单已经对订单信息造成改变
             boolean firstRucang = orderDO.getRucangTime() == null;
-
-            if (firstRucang) {
-                //在下面的函数中完成费用计算
-                orderService.finishOrderWarehouseIn(orderDO.getOrderId());
-            } else {
-                orderService.finishOrderWarehouseInUpdate(orderDO.getOrderId());
+            if (finishReqVO.getIsResetPrice()) {
+                // 默认执行计价业务，可以手动确认不执行计价业务
+                if (firstRucang) {
+                    //在下面的函数中完成费用计算
+                    orderService.finishOrderWarehouseIn(orderDO.getOrderId());
+                } else {
+                    orderService.finishOrderWarehouseInUpdate(orderDO.getOrderId());
+                }
             }
-
         }
 
         // 更新订单状态
@@ -1688,9 +1710,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         return false;
     }
 
-    private void processConsignorException(OrderWarehouseInFinishReqVO finishReqVO, Long orderId, OrderDO orderDO) {
+    private void processConsignorException(Boolean isUpdateCallback, Long orderId, OrderDO orderDO) {
         //入仓修改回调的入仓不需要生成单证异常和发货人异常
-        if (!Boolean.TRUE.equals(finishReqVO.getIsUpdateCallback())) {
+        if (!Boolean.TRUE.equals(isUpdateCallback)) {
             // 海运要发货人异常，空运不要发货人异常
             if (orderDO.getTransportId() != 3 && orderDO.getTransportId() != 4) {
                 // 1.12.发货人异常（客户档案设置了到仓确认，此类客户的货是通知装柜才可装）
@@ -1725,6 +1747,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         if (CollectionUtil.isEmpty(listOrderException)) {
                             orderExceptionService.createOrderException(orderExceptionCreateReqVO);
                         }
+                    } else {
+                        orderExceptionService.autoProcessException(orderId, null, OrderExceptionEnum.ORDER_CONSIGNOR_EXCEPTION,
+                                "系统自动处理为已处理", OrderExceptionResult.ORDER_CONSIGNOR_EXCEPTION_RESULT.CONFIRM_CHECK);
                     }
                 }
             }
@@ -1771,7 +1796,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 } else {
                     if (isUpdateCallback) {
                         // v2.2 当入仓纪录修改审批后，订单非重货且当前存在重货异常未处理，系统自动处理异常，处理结果设置为普货
-                        orderExceptionService.autoProcessException(orderId, null, OrderExceptionEnum.ORDER_HEAVY_CARGO_EXCEPTION, "订单入仓纪录修改，订单非重货，系统自动处理为已处理", OrderExceptionResult.ORDER_HEAVY_CARGO_EXCEPTION_RESULT.GENERAL_CARGO);
+                        orderExceptionService.autoProcessException(orderId, null, OrderExceptionEnum.ORDER_HEAVY_CARGO_EXCEPTION, "订单或入仓纪录修改，订单非重货，系统自动处理为已处理", OrderExceptionResult.ORDER_HEAVY_CARGO_EXCEPTION_RESULT.GENERAL_CARGO);
                         // 更新订单为普货
                         orderService.updateOrderType(orderId, 1);
                     } else {
@@ -6027,6 +6052,64 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
     }
 
+
+    public void processExceptionWhenOrderUpdate(Long orderId) {
+
+        OrderDO orderDO = orderService.getById(orderId);
+        if (orderDO == null) {
+            throw ServiceExceptionUtil.exception(
+                    ErrorCodeConstants.ORDER_NOT_EXISTS);
+        }
+
+        // 重置重泡货优惠
+        resetSpecialVWeightAndWeightUnit(orderId, orderDO,
+                false, // finishReqVO.getIsSumWeightNoChange(),
+                false //finishReqVO.getIsSumVolumeNoChange()
+                );
+
+        List<OrderWarehouseInDO> orderWarehouseInDOList =
+                orderWarehouseInMapper.selectList(OrderWarehouseInDO::getOrderId,
+                        orderDO.getOrderId());
+
+        if (CollUtil.isNotEmpty(orderWarehouseInDOList)) {
+            processChannelPackagingOverWeightException(orderDO);
+        }
+
+        // 重泡货配置
+        ZhongPaoBestVO zhongPaoBest = getZhongPaoBest(orderDO);
+
+        BigDecimal weightSum =
+                orderWarehouseInDOList.stream().map(OrderWarehouseInDO::getWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal volumeSum =
+                orderWarehouseInDOList.stream().map(OrderWarehouseInDO::getVolume).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        // 处理重泡货异常
+        processZhongPaoException(orderId, orderDO, zhongPaoBest, weightSum, volumeSum,
+                true, // finishReqVO.getIsUpdateCallback(),
+                false, // finishReqVO.getIsSumVolumeNoChange(),
+                false, // finishReqVO.getIsSumWeightNoChange(),
+                orderDO.getAirShipment() == 4 //finishStocked
+                );
+
+        // 处理发货人异常
+        processConsignorException(false, orderId, orderDO);
+
+        // 查询订单异常数量
+        List<OrderExceptionDO> orderUnProcessExceptionList =
+                orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderId, null, null);
+
+        // 重置异常状态
+        int exceptionNum = orderUnProcessExceptionList.size();
+        if (exceptionNum == 0) {
+            orderService.updateStatus(orderId, orderDO.getOrderNo(), null, 0, null, null, null, null, false);
+        } else if (exceptionNum == 1) {
+            // 由多个异常变成1个异常时，需要更新
+            OrderExceptionDO orderExceptionDO = orderUnProcessExceptionList.get(0);
+            orderService.updateStatus(orderId, orderDO.getOrderNo(),
+                    null, OrderAbnormalStateEnum.keyOf(orderExceptionDO.getOrderExceptionType()).getValue(), null, null, null, null, false);
+        }
+    }
+
     private OrderDO updateOrderSumPrevPacked(Long orderId) {
         orderService.updateSumDataPrevPacked(orderId);
         return orderService.getById(orderId);

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderWarehouseIn/OrderWarehouseInFinishReqVO.java

@@ -106,4 +106,9 @@ public class OrderWarehouseInFinishReqVO {
     @Transient
     private Boolean isAddOrderOperateLog = true;
 
+
+    //是否需要重订价
+    @Transient
+    private Boolean isResetPrice = true;
+
 }