Merge branch 'master-fix'

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

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.apollo.core.event.BoxCheckOrderSchedulingEvent;
-import cn.iocoder.yudao.framework.apollo.core.event.Order.CalculateOrderVValueEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.QueryChannelInfoEvent;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -1220,7 +1219,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 orderItemDOList,
                 isNotRollbackIn, orderWarehouseInDOList,
                 zhongPaoBest,
-                channelPackagingOverWeightAdditionalBoList);
+                channelPackagingOverWeightAdditionalBoList, false);
 
         if (CollectionUtil.isNotEmpty(channelPackagingOverWeightAdditionalBoList)) {
             channelPackagingOverWeightAdditionalBoList =
@@ -1903,7 +1902,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
     private void processOrderItemException(Long orderId, OrderDO orderDO, List<OrderItemDO> orderItemDOList,
                                            boolean isNotRollbackIn, List<OrderWarehouseInDO> orderWarehouseInDOList, ZhongPaoBestVO zhongPaoBest,
-                                           List<ChannelPackagingOverWeightAdditionalBo> channelPackagingOverWeightAdditionalBoList) {
+                                           List<ChannelPackagingOverWeightAdditionalBo> channelPackagingOverWeightAdditionalBoList, boolean isFinishStocked) {
         // 处理异常
         for (OrderItemDO orderItemDO : orderItemDOList) {
 
@@ -1934,8 +1933,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 // orderItem 设置warehouseInInfoVo
                 WarehouseInInfoVO warehouseInInfoVO = this.orderItemSetWarehouseInInfoVO(orderItemDO, orderWarehouseInDOListFilter);
 
-                // 处理空运订单 商品重量超限异常 和 商品路线重量超限异常
-                this.processAirOrderOverWeightException(orderId, orderDO, orderItemDO, warehouseInInfoVO, channelPackagingOverWeightAdditionalBoList);
+                // 处理空运订单 商品重量超限异常 和 商品路线重量超限异常 (完成入仓时才需要，备货完成时不需要处理）
+                if (!isFinishStocked) {
+                    this.processAirOrderOverWeightException(orderId, orderDO, orderItemDO, warehouseInInfoVO, channelPackagingOverWeightAdditionalBoList);
+                }
 
                 this.setOrderItemZhongPao(zhongPaoBest, orderItemDO, warehouseInInfoVO.getWeight(), warehouseInInfoVO.getVolume());
 
@@ -4722,7 +4723,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         ZhongPaoBestVO zhongPaoBest = getZhongPaoBest(orderDO);
 
         // 根据订单项产生异常，多箱，少箱，新增商品异常，入仓特性不符异常
-        processOrderItemException(orderId, orderDO, orderItemDOList, isNotRollbackIn, orderWarehouseInDOList, zhongPaoBest, channelPackagingOverWeightAdditionalBoList);
+        processOrderItemException(orderId, orderDO, orderItemDOList, isNotRollbackIn, orderWarehouseInDOList, zhongPaoBest, channelPackagingOverWeightAdditionalBoList, true);
 
         if (CollectionUtil.isNotEmpty(channelPackagingOverWeightAdditionalBoList)) {
             channelPackagingOverWeightAdditionalBoList = channelPackagingOverWeightAdditionalBoList.stream().filter(t -> !t.isMerged()).collect(Collectors.toList());

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxService.java

@@ -752,7 +752,7 @@ public interface BoxService extends IService<BoxDO> {
      *
      * @param orderIdList 订单列表
      */
-    void checkOrderPayStatus(Collection<Long> orderIdList);
+    void checkOrderPayStatus(BoxOrderMarkUpVO vo);
 
     void updateUlBoxTime(Long shipmentId, Date ulBoxTime);
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -5023,7 +5023,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
 
 
     @Override
-    public void checkOrderPayStatus(Collection<Long> orderIds) {
+    public void checkOrderPayStatus(BoxOrderMarkUpVO vo) {
+        Collection<Long> orderIds = vo.getOrderIds();
         if (CollectionUtil.isEmpty(orderIds)) return;
         List<ReceivableDO> receivableList =
                 receivableService.getOrderPayList(orderIds);
@@ -5031,13 +5032,18 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                 orderQueryService.getOrderList(orderIds);
         Map<Long, OrderDO> orderMap = orderList.stream()
                 .collect(Collectors.toMap(OrderDO::getOrderId, v -> v));
-
+        Boolean freightMarkUp = Objects.nonNull(vo.getFreightFee()) && vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0;
+        Boolean clearanceMarkUp = Objects.nonNull(vo.getClearanceFee()) && vo.getClearanceFee().compareTo(BigDecimal.ZERO) > 0;
         List<String> payOrderNoList = new ArrayList<>();
-
+        List<ReceivableDO> newReceivableList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(receivableList)) {
-            Map<Long, List<ReceivableDO>> receivableMap = receivableList.stream()
+            newReceivableList = receivableList.stream().filter(r -> r.getFeeSource() == 1
+                    && ((freightMarkUp && r.getFeeType() == 1) || (clearanceMarkUp && r.getFeeType() == 2))).collect(Collectors.toList());
+        }
+        if (CollectionUtil.isNotEmpty(newReceivableList)) {
+            // 只判断订单自动计算的运费与清关费应收单, 且运费加价，只判断运费应收单，清关费加价，只判断清关费应收单
+            Map<Long, List<ReceivableDO>> receivableMap = newReceivableList.stream()
                     .collect(Collectors.groupingBy(ReceivableDO::getOrderId));
-
             for (Map.Entry<Long,
                     List<ReceivableDO>> entry : receivableMap.entrySet()) {
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxApproval/BoxApprovalServiceImpl.java

@@ -421,7 +421,7 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
             String details = createReqVO.getDetails();
             BoxOrderMarkUpVO boxOrderMarkUpVO =
                     JSON.parseObject(details, BoxOrderMarkUpVO.class);
-            boxService.checkOrderPayStatus(boxOrderMarkUpVO.getOrderIds());
+            boxService.checkOrderPayStatus(boxOrderMarkUpVO);
         }
         //-----------------------------------------删单退场-------------------------------------------
         else if(createReqVO.getApprovalType() == BoxApprovalTypeEnum.DELETE_EXIT.getType()) {
@@ -1159,23 +1159,7 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
                     String details = boxApprovalDO.getDetails();
                     BoxOrderMarkUpVO boxOrderMarkUpVO =
                             JSON.parseObject(details, BoxOrderMarkUpVO.class);
-                    if(boxOrderMarkUpVO.getOrderIds()!=null)
-                    {
-                        String s=String.valueOf(boxOrderMarkUpVO.getOrderIds());
-                        zTest z=new zTest();
-                        z.setTestname("订单id，"+s);
-                        z.setCreatedate(new Date());
-                        zTestMapper2.insert(z);
-                    }
-                    else
-                    {
-                        String s=String.valueOf(boxOrderMarkUpVO.getOrderIds());
-                        zTest z=new zTest();
-                        z.setTestname("批量加价申报批，订单id为空");
-                        z.setCreatedate(new Date());
-                        zTestMapper2.insert(z);
-                    }
-                    boxService.checkOrderPayStatus(boxOrderMarkUpVO.getOrderIds());
+                    boxService.checkOrderPayStatus(boxOrderMarkUpVO);
                     boxService.batchAddPriceSuccess(shipmentId, details);
                 }
                 break;