2024-06-17-3提交

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

@@ -2223,7 +2223,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                                 || Objects.equals(TransportTypeShortEnum.AIR_SEA_COMBINED_TRANSPORT.getValue(),
                                 orderDO.getTransportId())) {
 
-                            // 没有待处理的清关费未报价异常，则需要生成
+                            //没有待处理的清关费未报价异常，则需要生成
                             //生成清关费异常 lanbm 2024-06-06 添加参数type=6,是处理价格异常
                             noQuoteOrAutomaticNoQuote =
                                     this.createClearanceFeeNoQuiteException(orderDO,
@@ -2251,6 +2251,17 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                                         type, orderNoCanShipmentChannelExceptionDOList);
                             }
                         }
+                        else
+                        {
+                            //海运也需要判断单询价异常逻辑 lanbm 2024-06-17 add
+                            OrderItemDO item =
+                                    orderItemMapper.selectById(
+                                            orderItemDO.getOrderItemId());
+                            // 非拆单订单完成入仓后，如果是已入仓的品名，线路价格设置了单询，
+                            // 且未生成过单询异常，则去生成单询异常
+                            this.createOrderInquiryException(orderDO,
+                                    item, warehouseInInfoVO, type);
+                        }
                         // 当订单未报价、或待确认商品时，都需要将预付状态置null
                         if (orderItemDO.getItemStatus() == -1 ||
                                 orderItemDO.getIsProd()) {
@@ -2418,7 +2429,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
 
         if (orderItemDO.getNeedOrderInquiry() != null) {
 
-            String s = "type=" + type.toString() +
+            String sNo="";
+            if(orderDO.getOrderNo()!=null)sNo=orderDO.getOrderNo();
+
+            String s =sNo+"未报价日志，type=" + type.toString() +
                     "getTransportId=" + orderDO.getTransportId().toString() +
                     "getNeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry();
 
@@ -2516,7 +2530,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             return;
         }
 
-        String s = "type=" + type.toString() + "Status=" +
+        String s = "单询价日志，type=" + type.toString() + "Status=" +
                 orderDO.getStatus().toString();
 
         if (Objects.nonNull(orderItemDO.getNeedOrderInquiry())) {
@@ -2557,9 +2571,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
 
         saveLog(orderDO, orderItemDO, warehouseInInfoVO, type);
 
-        // 避免在前面自动处理未报价异常和清关费未报价异常时的回调，优先创建了单询异常，造成并发的重复创建
+        // 避免在前面自动处理未报价异常和清关费未报价异常时的回调，
+        // 优先创建了单询异常，造成并发的重复创建
         if (CollectionUtil.isEmpty(orderInquiryExceptionDOList)) {
-            if ((Objects.equals(orderDO.getStatus(), OrderStatusEnum.IN_WAREHOUSE.getValue()) ||
+            if ((Objects.equals(orderDO.getStatus(),
+                    OrderStatusEnum.IN_WAREHOUSE.getValue()) ||
                     type == 15 || type == 10) &&
                     Objects.nonNull(warehouseInInfoVO)
                     && warehouseInInfoVO.getCartonsNum() > 0
@@ -2567,6 +2583,8 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     && orderItemDO.getNeedOrderInquiry() == 1
                     && Objects.nonNull(orderItemDO.getIsHandlerOrderInquiryException())
                     && !orderItemDO.getIsHandlerOrderInquiryException()) {
+                //getCartonsNum 入库箱数
+                //getIsHandlerOrderInquiryException 是否处理过单询价异常
                 // 产生单询异常
                 OrderExceptionCreateReqVO orderExceptionCreateReqVO =
                         this.genOrderException(orderDO.getOrderId(),
@@ -2623,7 +2641,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                         CollectionUtil.newArrayList(OrderExceptionEnum.GOODS_OVERWEIGHT_EXCEPTION.getKey(), OrderExceptionEnum.LINE_WEIGHT_EXCEPTION.getKey()));
 
         if (orderItemDO.getNeedOrderInquiry() != null) {
-            String s = "type=" + type.toString() + " TransportId=" +
+            String sNo="";
+            if(orderDO.getOrderNo()!=null)sNo=orderDO.getOrderNo();
+
+            String s =sNo+"清关价日志，type=" + type.toString() + " TransportId=" +
                     orderDO.getTransportId().toString() +
                     " NeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry().toString();