Merge branch 'master-fix' into release

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

@@ -757,7 +757,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

@@ -5042,7 +5042,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);
@@ -5050,13 +5051,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 = vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0;
+        Boolean clearanceMarkUp = 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()) {
@@ -1160,23 +1160,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;