2024-06-28-1提交

yudao-dependencies/pom.xml

@@ -51,7 +51,7 @@
         <mapstruct.version>1.4.1.Final</mapstruct.version>
         <hutool.version>5.6.1</hutool.version>
         <pinyin4j.version>2.5.0</pinyin4j.version>
-        <!--lanbm 2024-06-11 修改版本 2.2.7 -->
+        <!--修改版本 2.2.7 -->
         <easyexcel.verion>2.2.7</easyexcel.verion>
         <ooxml.verion>1.0</ooxml.verion>
         <velocity.version>2.2</velocity.version>

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java

@@ -137,7 +137,6 @@ public class JsonUtils {
     }
 
     /*
-   lanbm 2024-04-12 add
    保存指定的测试信息
    */
     public static void SaveLog(String content) {

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/i18n/core/I18nMessage.java

@@ -94,7 +94,7 @@ public class I18nMessage {
 
     /**
      * 获取一条语言配置信息（后台管理）
-     * 判断当前系统使用的语言 lanbm 2024-05-28 添加注释
+     * 判断当前系统使用的语言
      * @return
      * @throws IOException
      */

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java

@@ -19,7 +19,7 @@ public class BpmTaskApproveReqVO {
     private String id;
 
     /*
-     lanbm 2024-05-24 修改为审批意见可以为空，
+     修改为审批意见可以为空，
      客户要求部分审批流程不用写审批意见
      */
     @ApiModelProperty(value = "审批意见", required = false, example = "不错不错！")

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/finance/listener/BmpFinanceCommissionPaymentApproveListener.java

@@ -21,7 +21,6 @@ public class BmpFinanceCommissionPaymentApproveListener extends BpmProcessInstan
 
     @Override
     protected void onEvent(BpmProcessInstanceResultEvent event) {
-        //lanbm 2024-05-13 添加注释
         //ecw_payment 付款单审批回调函数
         //ecw_payment_approval  付款单审核表
         log.info("--------------------------------------------{},{}", event.getBusinessKey(), event.getResult());

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/finance/listener/BmpFinanceReceiptApproveListener.java

@@ -24,7 +24,6 @@ public class BmpFinanceReceiptApproveListener extends BpmProcessInstanceResultEv
 
     @Override
     protected void onEvent(BpmProcessInstanceResultEvent event) {
-        //lanbm 2024-05-13添加注释
         //财务收款单 ecw_receipt
         //收款单或者收款明细审核表 ecw_receipt_approval
         log.info("--------------------------------------------{},{}", event.getBusinessKey(), event.getResult());

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/order/listener/BpmOrdeFreeApplyResultListener.java

@@ -23,9 +23,8 @@ public class BpmOrdeFreeApplyResultListener extends BpmProcessInstanceResultEven
 
     @Override
     protected void onEvent(BpmProcessInstanceResultEvent event) {
-        //订单费用申请回调函数 lanbm 2024-05-15 添加注释
         log.info("------------------费用审核回调--------------------------{},{}" , event.getBusinessKey(), event.getResult());
-        //lanbm 2024-05-16 处理报应收款不存在的BUG
+        //处理报应收款不存在的BUG
         orderFeeApplicationService.updateFeeApproveResult(event.getBusinessKey(), event.getResult());
     }
 

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/order/listener/BpmOrderWarehousingModificationResultListener.java

@@ -11,7 +11,6 @@ import javax.annotation.Resource;
 
 /*
  入仓修改审批
- lanbm 2024-05-31 添加注释
  */
 @Component
 @Slf4j

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/shipment/listener/BmpShipmentBatchAddPriceListener.java

@@ -26,7 +26,7 @@ public class BmpShipmentBatchAddPriceListener extends BpmProcessInstanceResultEv
     protected void onEvent(BpmProcessInstanceResultEvent event) {
         log.info("---------------------批量加价审核回调-----------------------{},{}",
                 event.getBusinessKey(), event.getResult());
-        //lanbm 2024-06-18 改为空运和海运都有此逻辑点
+        //改为空运和海运都有此逻辑点
         //运费，清关费，币种，单位都要和元订单一致才能生效
         boxApprovalService.updateBoxApproveResult(
                 WorkFlowEmus.SHIPMENT_BATCH_ADD_PRICE.getKey(),

yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java

@@ -133,7 +133,7 @@ public class BpmTaskController {
     }
 
     /*
-     批量审批不通过 lanbm 2024-05-20 add
+     批量审批不通过
      */
     @PutMapping("/reject2")
     @ApiOperation("不通过任务")

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/UserBackVO.java

@@ -53,15 +53,12 @@ public class UserBackVO {
     private String loginIp;
 
     @ExcelProperty("最后登录时间")
-    //lanbm 2024-05-15 修改显示BUG
     //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "最后登录时间")
     private Date loginDate;
 
-    //lanbm 2024-06-16 update
     @ExcelProperty("创建时间")
-    //lanbm 2024-05-15 修改显示BUG
     //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间", required = true)

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/member/MemberBackVO.java

@@ -51,7 +51,6 @@ public class MemberBackVO {
     private String loginIp;
 
     @ExcelProperty("最后登录时间")
-    //lanbm 2024-05-15 修改显示BUG
     //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "最后登录时间")
@@ -62,7 +61,6 @@ public class MemberBackVO {
     private String backLetterImg;
 
     @ExcelProperty("创建时间")
-    //lanbm 2024-05-15 修改显示BUG
     //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间", required = true)

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

@@ -60,7 +60,7 @@ public class ProductPriceExceptionHandleListener {
 
 
     /*
-     处理好报价相关的订单的异常 lanbm 2024-05-31
+     处理好报价相关的订单的异常
      */
     public void orderOtherFeeEvent(HandleData event) {
         List<ProductPriceDO> priceList = event.getNeedHandleList();

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

@@ -633,7 +633,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         zTestMapper.insert(z);
     }
 
-    //记录逻辑日志 lanbm 2024-06-18 add
+    //记录逻辑日志
     private String getLog(OrderItemDO it, BigDecimal freightFee,
                           Integer freightCurrencyId,
                           Long freightUnitId) {
@@ -821,15 +821,28 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
     @Async
     public void airOrderPriceRefresh(OrderDO orderDO) {
         log.info("空运订单[{}]重订价开始...", orderDO.getOrderNo());
-        List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId()));
+        List<OrderItemDO> orderItemDOList =
+                orderItemMapper.selectList(
+                        new LambdaQueryWrapper<OrderItemDO>().
+                                eq(OrderItemDO::getOrderId,
+                                        orderDO.getOrderId()));
 
-        OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
-        OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
+        OrderConsignorDO orderConsignorDO =
+                orderConsignorService.getOne(
+                        new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
+        OrderConsigneeDO orderConsigneeDO =
+                orderConsigneeService.getOne(
+                        new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
 
-        this.costCalculation("0", orderDO, orderConsignorDO.getCustomerId(),
-                orderConsigneeDO.getCustomerId(), orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(),
+        this.costCalculation("0", orderDO,
+                orderConsignorDO.getCustomerId(),
+                orderConsigneeDO.getCustomerId(),
+                orderConsignorDO.getCustomerContactsId(),
+                orderConsigneeDO.getCustomerContactsId(),
                 orderItemDOList, 30);
-        this.addOrderOperateLog(orderDO.getOrderId(), "空运待出订单每日重订价", null);
+
+        this.addOrderOperateLog(orderDO.getOrderId(),
+                "空运待出订单每日重订价", null);
         log.info("空运订单[{}]重订价结束...", orderDO.getOrderNo());
     }
 
@@ -2083,7 +2096,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         convertOrderOperateLog(orderId, StringUtils.isNotBlank(type) ? type : "订单操作", msg, Objects.isNull(applyInfoVOList) ? null : JSONObject.toJSONString(applyInfoVOList));
     }
 
-    private void convertOrderOperateLog(Long orderId, String type, String msg, String note) {
+    private void convertOrderOperateLog(Long orderId,
+                                        String type,
+                                        String msg,
+                                        String note) {
         OrderOperateLogCreateReqVO reqVO = new OrderOperateLogCreateReqVO();
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         // 获得 Request 对象
@@ -2165,15 +2181,21 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         String userId = String.valueOf(SecurityFrameworkUtils.getLoginUserId());
         OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
         OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
-        this.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(),
-                orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 50);
-        this.addOrderOperateLog(orderDO.getOrderId(), "有活动更新订单计价", null);
+        this.costCalculation(userId, orderDO,
+                orderConsignorDO.getCustomerId(),
+                orderConsigneeDO.getCustomerId(),
+                orderConsignorDO.getCustomerContactsId(),
+                orderConsigneeDO.getCustomerContactsId(),
+                orderItemDOList, 50);
+        this.addOrderOperateLog(orderDO.getOrderId(),
+                "有活动更新订单计价", null);
     }
 
 
     //14 是批量加价
     //15 是费用计算
     //10 入仓更新
+    //30 空运定时刷新价格
     public void costCalculation(String userId,
                                 OrderDO orderDO,
                                 Long consignorCustomerId,
@@ -2182,7 +2204,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                                 Long consigneeCustomerContactsId,
                                 List<OrderItemDO> orderItemDOList,
                                 Integer type) {
+
         //2023-7月之前应收金额没有按四舍五入取整，之后都是按四舍五入取整处理的
+        //空运运费根据产品阶梯价来取值，清关费根据路线和包装类型取值，谁大取谁
+
         LogisticsInfoDto logisticsInfoDto =
                 warehouseLineMapper.getStartInfoAndDestInfoByLineId(
                         orderDO.getLineId());
@@ -2257,6 +2282,8 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             this.calculationOrderItem(orderDO, orderItemDOList,
                     zhongPaoBestVO, event.getBubbleWeightRatio());
         }
+
+
         //计算订单商品项
         //计算单种运输方式的商品费用，并批量插入
         CalculationItemFeeDto dto = this.insertOrderItemDOList(userId,
@@ -2362,13 +2389,24 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             }
         }
 
+        //计较体积
 
-        BigDecimal chargeVolume = newOrderItemDOList.stream().map(OrderItemDO::getChargeVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal chargeVolume =
+                newOrderItemDOList.stream().map(OrderItemDO::getChargeVolume).
+                        reduce(BigDecimal.ZERO, BigDecimal::add);
         BigDecimal sumVolume = newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).filter(Objects::nonNull).map(WarehouseInInfoVO::getVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
         orderDO.setSumVolume(sumVolume);
 
-        BigDecimal chargeWeight = newOrderItemDOList.stream().map(OrderItemDO::getChargeWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal sumWeight = newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).filter(Objects::nonNull).map(WarehouseInInfoVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //计价总重量
+
+        BigDecimal chargeWeight =
+                newOrderItemDOList.stream().map(OrderItemDO::getChargeWeight).
+                        reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        BigDecimal sumWeight =
+                newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).
+                        filter(Objects::nonNull).map(WarehouseInInfoVO::getWeight).
+                        reduce(BigDecimal.ZERO, BigDecimal::add);
 
         orderDO.setSumWeight(sumWeight);
         Integer sumNum = newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).filter(Objects::nonNull).mapToInt(WarehouseInInfoVO::getCartonsNum).sum();
@@ -2590,7 +2628,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     orderExceptionService.createOrderException(orderExceptionCreateReqVO);
                 }
             }
-            // 获取订单最新数据状态
+            //获取订单最新数据状态
             OrderDO newOrder = orderMapper.selectById(orderDO.getOrderId());
             // 判断空运已入仓订单状态如果是默认出货状态0，且无异常、无审批，那么标记为可出
             this.airShipmentStateUpdate(type, newFeeDtoList, newOrder);
@@ -2768,7 +2806,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             z.setCreatedate(new Date());
             zTestMapper.insert(z);
         }
-        //lanbm 2024-06-06 添加的逻辑点
         zTest z2 = new zTest();
         z2.setTestname("处理24");
         z2.setCreatedate(new Date());
@@ -3140,7 +3177,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
      * @param zhongPaoBestVO           重泡货配置
      * @param channelBubbleWeightRatio 渠道泡重比例配置
      */
-    private void calculationOrderItem(OrderDO orderDO, List<OrderItemDO> orderItemDOList, ZhongPaoBestVO zhongPaoBestVO, BigDecimal channelBubbleWeightRatio) {
+    private void calculationOrderItem(OrderDO orderDO,
+                                      List<OrderItemDO> orderItemDOList,
+                                      ZhongPaoBestVO zhongPaoBestVO,
+                                      BigDecimal channelBubbleWeightRatio) {
         // 重货总重量
         BigDecimal heavyCargoTotalWeight = BigDecimal.ZERO;
         BigDecimal totalWeight = BigDecimal.ZERO;
@@ -3208,9 +3248,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             infoVO.setNewValue(String.format("((泡重%s-实重%s) * 渠道泡重比%s)+实重%s = 渠道泡重比例收费值%s", vWeight, totalWeight, channelBubbleWeightRatio, totalWeight, channelBubbleWeight));
             infoVOList.add(infoVO);
         }
-        if (CollectionUtil.isNotEmpty(infoVOList) && infoVOList.size() > 0 && orgTotalVWeight.compareTo(orderDO.getVWeight()) != 0) {
+        if (CollectionUtil.isNotEmpty(infoVOList) && infoVOList.size() > 0
+                && orgTotalVWeight.compareTo(orderDO.getVWeight()) != 0) {
             // 泡货收费值计算日志, 当计算数据变动时，再添加日志
-            this.addOrderOperateLog(orderDO.getOrderId(), null, "泡货收费值取最低值变动", infoVOList);
+            this.addOrderOperateLog(orderDO.getOrderId(),
+                    null, "泡货收费值取最低值变动", infoVOList);
         }
         orderDO.setOrgWVolume(totalWeight.divide(orderDO.getOrgWeightUnit(), 2, RoundingMode.HALF_UP));
         BigDecimal orgVWeight = totalVolume.multiply(orderDO.getOrgVolumeUnit()).setScale(2, RoundingMode.HALF_UP);
@@ -3311,16 +3353,20 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                 }
             }
             if (null == orderItemDO.getNum()) {
-                throw exception(PROD_NUM_NOT_NULL, I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
+                throw exception(PROD_NUM_NOT_NULL,
+                        I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
             }
             if (null == orderItemDO.getQuantity()) {
-                throw exception(PROD_QUANTITY_NOT_NULL, I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
+                throw exception(PROD_QUANTITY_NOT_NULL,
+                        I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
             }
             if (null == orderItemDO.getVolume()) {
-                throw exception(PROD_VOLUME_NOT_NULL, I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
+                throw exception(PROD_VOLUME_NOT_NULL,
+                        I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
             }
             if (null == orderItemDO.getWeight()) {
-                throw exception(PROD_WEIGHT_NOT_NULL, I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
+                throw exception(PROD_WEIGHT_NOT_NULL,
+                        I18nMessage.getLang() == 0 ? productDO.getTitleZh() : productDO.getTitleEn());
             }
             orderItemDO.setTransportId(orderDO.getTransportId());
             orderItemDO.setLineId(orderDO.getLineId());
@@ -3361,10 +3407,22 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
 
             param.setItemType(orderItemDO.getItemType());
             param.setNeedOrderInquiry(orderItemDO.getNeedOrderInquiry());
-            param.setChargeWeight(Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) ?
-                    orderItemDO.getChargeWeight() : (Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue()) || Objects.equals(orderDO.getStatus(), OrderStatusEnum.ORDER_PLACED.getValue()) ? orderItemDO.getWeight() : null));
-            param.setChargeVolume(Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) ?
-                    orderItemDO.getChargeVolume() : (Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue()) || Objects.equals(orderDO.getStatus(), OrderStatusEnum.ORDER_PLACED.getValue()) ? orderItemDO.getVolume() : null));
+
+            //计较重量
+            param.setChargeWeight(
+                    Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) ? orderItemDO.getChargeWeight() :
+                            (Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue()) ||
+                                    Objects.equals(orderDO.getStatus(), OrderStatusEnum.ORDER_PLACED.getValue()) ?
+                                    orderItemDO.getWeight() : null)
+            );
+            //计价体积
+            param.setChargeVolume(
+                    Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) ?
+                    orderItemDO.getChargeVolume() :
+                            (Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue()) ||
+                                    Objects.equals(orderDO.getStatus(),OrderStatusEnum.ORDER_PLACED.getValue()) ? orderItemDO.getVolume() : null)
+            );
+
             param.setChargeQuantity(Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) ?
                     orderItemDO.getChargeQuantity() : (Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue()) || Objects.equals(orderDO.getStatus(), OrderStatusEnum.ORDER_PLACED.getValue()) ? new BigDecimal(orderItemDO.getQuantity()) : null));
 

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

@@ -606,7 +606,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         }
 
         // 物流信息查询
-        LogisticsInfoDto initialLogisticsInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(dto.getLineId());
+        LogisticsInfoDto initialLogisticsInfoDto =
+                warehouseLineMapper.getStartInfoAndDestInfoByLineId(dto.getLineId());
         if (Objects.isNull(initialLogisticsInfoDto)) {
             throw exception(NOT_FIND_LOGISTICS_INFO);
         }
@@ -679,7 +680,10 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             dto.setCountry(orderConsigneeDO.getCountry());
         }
         // 商品列表信息
-        List<OrderItemBackVO> backVOList = orderItemMapper.infoItemList(orderId, I18nMessage.getLang());
+        //oneSeaFreight 运费单价
+        //oneClearanceFreight 清关费单价
+        List<OrderItemBackVO> backVOList =
+                orderItemMapper.infoItemList(orderId, I18nMessage.getLang());
         if (CollectionUtil.isNotEmpty(backVOList)) {
             backVOList = fillOrderItemProperties(backVOList);
             // 转换数据字段
@@ -689,13 +693,12 @@ public class OrderQueryServiceImpl implements OrderQueryService {
 
             dto.setOrderItemVOList(backVOList);
         }
-        // 订单动态 lanbm 2024-06-11 添加注释
+        // 订单动态
         // 订单的到仓时间 去动态值 businessTime
         List<OrderTimeDO> orderTimeList =
                 orderTimeMapper.selectList(
                         new LambdaQueryWrapper<OrderTimeDO>().eq(OrderTimeDO::getOrderId, orderId).orderByDesc(OrderTimeDO::getId));
         if (CollectionUtil.isNotEmpty(orderTimeList)) {
-            //lanbm 2024-06-11 添加的函数
             getDaoCanTiam(orderTimeList);
             dto.setOrderTimeVOList(OrderTimeConvert.INSTANCE.convertList(
                     orderTimeList));
@@ -740,7 +743,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 //i.getBusinessTime();
                 long l = i.getOrderId();
                 //long shpId = orderTimeMapper.getShipment_id(l);
-                //在订单操作日志中获取卸柜时间 2024-06-14 update
+                //在订单操作日志中获取卸柜时间
                 Date d = orderTimeMapper.getUlboxtime(l);
                 if (d != null) i.setBusinessTime(d);
             }
@@ -748,18 +751,25 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     }
 
     @NotNull
-    private List<OrderItemBackVO> fillOrderItemProperties(List<OrderItemBackVO> backVOList) {
+    private List<OrderItemBackVO> fillOrderItemProperties(
+            List<OrderItemBackVO> backVOList) {
         if (CollectionUtil.isEmpty(backVOList)) {
             return backVOList;
         }
         return backVOList.stream().peek(item -> {
 
-            if (!item.getChannelManualPricing() && !item.getSpecialPriceType() && !item.getSplitCustomPriceType() && Objects.nonNull(item.getOriginalSeaFreight()) && item.getOriginalSeaFreight().compareTo(BigDecimal.ZERO) == 0) {
+            if (!item.getChannelManualPricing() &&
+                    !item.getSpecialPriceType() &&
+                    !item.getSplitCustomPriceType() &&
+                    Objects.nonNull(item.getOriginalSeaFreight())
+                    && item.getOriginalSeaFreight().compareTo(BigDecimal.ZERO) == 0) {
                 // 表示当前运费没有原价，且不是设置了相关特价，则将预付状态置null
                 item.setIsPayAdvance(null);
             }
             // 运费成本价=销售价-明佣-暗佣
-            item.setCostSeaFreight(item.getOneSeaFreight().subtract(item.getPlainCommission()).subtract(item.getHiddenCommission()));
+            item.setCostSeaFreight(item.getOneSeaFreight().
+                    subtract(item.getPlainCommission()).
+                    subtract(item.getHiddenCommission()));
             // 清关费成本价=销售价
             item.setCostClearanceFreight(item.getOneClearanceFreight());
             if (Objects.nonNull(item.getWarehouseInInfoVO())) {
@@ -803,7 +813,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             item.setChargeVolume(new BigDecimal(item.getWVolume()));
             item.setChargeQuantity(new BigDecimal(item.getQQuantity()));
             //订单项入仓影像
-            List<OrderWarehousePictureDO> warehousePictureList = orderWarehousePictureService.getWarehousePictureList(5, item.getOrderItemId());
+            List<OrderWarehousePictureDO> warehousePictureList =
+                    orderWarehousePictureService.getWarehousePictureList(5, item.getOrderItemId());
             if (CollectionUtil.isNotEmpty(warehousePictureList)) {
                 List<String> pictureUrls = warehousePictureList.stream().map(OrderWarehousePictureDO::getUrl).collect(Collectors.toList());
                 item.setPictureUrls(pictureUrls);
@@ -846,7 +857,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             item.setOriginalCostSeaFreight(originalCostSeaFreight);
 
             // 清关费原价= 原始价格(无牌无液无电)+特殊加价-优惠
-            BigDecimal originalCostClearanceFreight = item.getOriginalClearanceFreight()
+            BigDecimal originalCostClearanceFreight =
+                    item.getOriginalClearanceFreight()
                     .add(item.getBrandClearanceFeePrice())
                     .add(item.getElectrifiedClearanceFeePrice())
                     .add(item.getLiquidClearanceFeePrice())

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

@@ -196,24 +196,32 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                                MemberUserDO memberUserDO) {
         int type = 1;
         // 获取功能开关
-        List<DictDataRespDTO> dictList = dictDataApi.getDictDatas("part_function_switch");
+        List<DictDataRespDTO> dictList =
+                dictDataApi.getDictDatas("part_function_switch");
         // 智慧预装功能开关
         DictDataRespDTO dictDataRespDTO = dictList.stream().filter(dto -> "create_order_phone_limit".equals(dto.getLabel())).findFirst().orElse(null);
         if ((Objects.isNull(createReqVO.getIsCargoControl()) || !createReqVO.getIsCargoControl()) &&
                 Objects.nonNull(dictDataRespDTO) && StringUtils.equals(dictDataRespDTO.getValue(), "11") && StringUtils.isNotBlank(createReqVO.getCountryCode()) && StringUtils.equals("86", createReqVO.getCountryCode())) {
             throw exception(CONSIGNEE_PHONE_IS_EXTERNAL);
         }
-        LogisticsInfoDto logisticsInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(createReqVO.getLineId());
+        LogisticsInfoDto logisticsInfoDto =
+                warehouseLineMapper.getStartInfoAndDestInfoByLineId(
+                        createReqVO.getLineId());
         if (Objects.isNull(logisticsInfoDto)) {
             throw exception(ORDER_LINE_NOT_EXIST);
         }
-        if (!Objects.equals(logisticsInfoDto.getStartCityId(), createReqVO.getDepartureId()) || !Objects.equals(logisticsInfoDto.getDestCityId(), createReqVO.getObjectiveId())) {
+        if (!Objects.equals(logisticsInfoDto.getStartCityId(),
+                createReqVO.getDepartureId()) || !Objects.equals(
+                        logisticsInfoDto.getDestCityId(), createReqVO.getObjectiveId())) {
             throw exception(ORDER_DEPARTURE_OBJECTIVE_AND_LINE_NOT_AGREEMENT);
         }
-        if (createReqVO.getIsExternalWarehouse() != null && createReqVO.getIsExternalWarehouse() && StringUtils.isNotBlank(createReqVO.getType()) && createReqVO.getType().contains("1")) {
+        if (createReqVO.getIsExternalWarehouse() != null &&
+                createReqVO.getIsExternalWarehouse() &&
+                StringUtils.isNotBlank(createReqVO.getType()) && createReqVO.getType().contains("1")) {
             throw exception(EXTERNAL_WAREHOUSE_AND_CONCENTRATE_TRANSPORT_NOT_PARALLEL);
         }
-        if (createReqVO.getIsExternalWarehouse() != null && createReqVO.getIsExternalWarehouse() && !Objects.equals(createReqVO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
+        if (createReqVO.getIsExternalWarehouse() != null &&
+                createReqVO.getIsExternalWarehouse() && !Objects.equals(createReqVO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
             // 校验外部仓信息是否为空
             if (CollectionUtil.isEmpty(createReqVO.getExternalWarehouseDtoList())) {
                 throw exception(ORDER_EXTERNAL_WAREHOUSE_NOT_NULL);
@@ -224,7 +232,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 throw exception(ORDER_EXTERNAL_WAREHOUSE_ADDRESS_AND_LOADING_TIME_NOT_NULL);
             }
         } else {
-            if (Objects.isNull(createReqVO.getDeliveryDate()) && !Objects.equals(createReqVO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
+            if (Objects.isNull(createReqVO.getDeliveryDate()) &&
+                    !Objects.equals(createReqVO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
                 throw exception(ORDER_DELIVERY_DATE_NOT_NULL);
             }
         }
@@ -244,7 +253,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             createReqVO.setCustomsClearCert(false);
             createReqVO.setAirlineCompany(0L);
         }
-        List<OrderItemDO> orderItemDOList = createReqVO.getOrderItemVOList().stream().map(OrderItemConvert.INSTANCE::convert).collect(Collectors.toList());
+        List<OrderItemDO> orderItemDOList =
+                createReqVO.getOrderItemVOList().stream().map(
+                        OrderItemConvert.INSTANCE::convert).collect(Collectors.toList());
         // 插入
         OrderDO order = OrderConvert.INSTANCE.convert(createReqVO);
         if (3 == createReqVO.getDrawee()) {
@@ -326,7 +337,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             String[] packageTypes = order.getPackageType().split(StrUtil.COMMA);
             List<OrderSpecialNeedCreateReqVO> createReqVOList = new ArrayList<>();
             for (String packageType : packageTypes) {
-                OrderSpecialNeedCreateReqVO reqVO = new OrderSpecialNeedCreateReqVO();
+                OrderSpecialNeedCreateReqVO reqVO =
+                        new OrderSpecialNeedCreateReqVO();
                 reqVO.setOrderId(order.getOrderId());
                 reqVO.setAdvanceType(packageType);
                 reqVO.setTransFee(BigDecimal.ZERO);
@@ -340,7 +352,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
         if (Objects.isNull(memberUserDO) || null == createReqVO.getUserId()) {
             // admin添加的订单
-            this.adminSaveConsignorAndConsignee(createReqVO, order, creator, now, dictDataRespDTO);
+            this.adminSaveConsignorAndConsignee(createReqVO,
+                    order,
+                    creator,
+                    now,
+                    dictDataRespDTO);
         } else {
             // app-web添加的订单
             this.appSaveConsignorAndConsignee(createReqVO, order,
@@ -359,13 +375,18 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
 
         // 插入订单商品项
-        orderBusinessService.costCalculation(creator, order, createReqVO.getConsignorId(), createReqVO.getConsigneeId(),
-                createReqVO.getConsignorContactsId(), createReqVO.getConsigneeContactsId(), orderItemDOList, type);
+        orderBusinessService.costCalculation(creator,
+                order, createReqVO.getConsignorId(),
+                createReqVO.getConsigneeId(),
+                createReqVO.getConsignorContactsId(),
+                createReqVO.getConsigneeContactsId(),
+                orderItemDOList, type);
 
 
         // 如果报价单id不为空，则表示此订单关联报价单
         if (Objects.nonNull(createReqVO.getOfferId()) &&
                 createReqVO.getOfferId() > 0L) {
+
             applicationContext.publishEvent(
                     new OfferAssociationOrderEvent(createReqVO.getOfferId(),
                             order.getOrderId(),
@@ -437,9 +458,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         customerCreditLogService.sendPackageCreditLog(createReqVO.getConsignorContactsId(), order.getOrderId(), order.getOrderNo());
 
         // 创建订单操作日志
-        orderBusinessService.addOrderOperateLog(order.getOrderId(), "新建订单", null);
+        orderBusinessService.addOrderOperateLog(order.getOrderId(),
+                "新建订单", null);
 
-        //lanbm 2024-04-13 修改，在创建完订单号，计算订单业绩类型
+        //在创建完订单号，计算订单业绩类型
         CalculateOrderYeJiTypeEvent even = new CalculateOrderYeJiTypeEvent();
         even.setOrderId(order.getOrderId());
         applicationContext.publishEvent(even);

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

@@ -302,7 +302,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
     }
 
     /*
-     创建入仓记录 lanbm 2024-05-28添加注释
+     创建入仓记录
      */
     @Override
     @Transactional(rollbackFor = Exception.class)

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/task/AirOrderPriceRefreshJob.java

@@ -39,13 +39,15 @@ public class AirOrderPriceRefreshJob implements JobHandler {
             transportIdList.add(3);
         }
         // 获取空运需要每日定时刷新价格的订单列表(待入仓、入仓中、已入仓-待出空运订单)
-        List<OrderDO> orderDOList = orderQueryService.getAirRefreshOrderPrice(transportIdList);
+        List<OrderDO> orderDOList =
+                orderQueryService.getAirRefreshOrderPrice(transportIdList);
         if (CollectionUtil.isNotEmpty(orderDOList)) {
             log.info("开始刷新空运订单价格...");
             int num = 0;
             for (OrderDO orderDO : orderDOList) {
 //                if (orderDO.getStatus() == 2 || orderDO.getStatus() == 3 || (orderDO.getStatus() == 5 && orderDO.getAirShipment() == 1)) {
-                if (orderDO.getStatus() == 2 || orderDO.getStatus() == 3 || orderDO.getStatus() == 5) {
+                if (orderDO.getStatus() == 2 || orderDO.getStatus() == 3 ||
+                        orderDO.getStatus() == 5) {
                     orderBusinessService.airOrderPriceRefresh(orderDO);
                     num++;
                 }

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1440,7 +1440,11 @@
         </if>
 
         <if test="query.salesmanId != null ">
-            AND (o.`salesman_id` = #{query.salesmanId} or o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service = #{query.salesmanId} ))
+            AND (o.`salesman_id` = #{query.salesmanId} or
+                        o.`customer_id` in(
+                        select cus.id from ecw_customer cus
+                        where cus.is_customer_service_confirmed =
+                        1 and cus.customer_service = #{query.salesmanId} ))
         </if>
 
 
@@ -1623,7 +1627,8 @@
             wi.`update_time` between #{query.beginWarehouseInTime} and #{query.endWarehouseInTime})
         </if>
         <if test="query.creator != null and query.creator != '' ">
-            AND o.`creator` = #{query.creator} and (o.user_id is null or o.user_id = 0)
+            <!--2024-06-28 我的订单，客户要去除创建人是本人，业绩归属是当前用户的订单-->
+            AND (o.`creator` = #{query.creator} or o.salesman_id=#{query.creator}) and (o.user_id is null or o.user_id = 0)
         </if>
         <if test = 'query.cargoControlStatus != null and query.cargoControlStatus != 3'>
             AND o.`cargo_control_status` = #{query.cargoControlStatus}

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java

@@ -121,11 +121,9 @@ public class OrderController {
     @Resource
     private RedisHelper redisHelper;
 
-    //lanbm 2024-05-13 add
     @Resource
     private ApplicationContext applicationContext;
 
-
     /**
      * 订单修改操作的防重复提交缓存key
      */
@@ -154,7 +152,7 @@ public class OrderController {
             }
         }
 
-        //lanbm 2024-05-13 添加注释 member_user 注册会员用户
+        // member_user 注册会员用户
         Long orderId = orderService.createOrder(createReqVO,
                 null).getOrderId();
         return success(orderId);

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java

@@ -441,7 +441,6 @@ public class ProdCostCalculation {
                             multiply(new BigDecimal("0.002")).
                             multiply(exchangeRateRespDTO.getCurrencyRate()).
                             setScale(0, RoundingMode.HALF_UP);
-
                     //insuranceFee  修改报价费币种BUG
                     costDto.setInsuranceFee(insuranceFee);
                     feeDto.setAmount(insuranceFee);
@@ -667,11 +666,9 @@ public class ProdCostCalculation {
                             .eq(ProductPriceDO::getProductId, prodParam.getProdId())
                             .eq(ProductPriceDO::getWarehouseLineId, lineId)
                             .and(we -> we.le(ProductPriceDO::getValidateStartDate, DateUtil.date())
-                                    .or()
-                                    .isNull(ProductPriceDO::getValidateStartDate))
+                                    .or().isNull(ProductPriceDO::getValidateStartDate))
                             .and(we -> we.ge(ProductPriceDO::getValidateEndDate, DateUtil.date())
-                                    .or()
-                                    .isNull(ProductPriceDO::getValidateEndDate))
+                                    .or().isNull(ProductPriceDO::getValidateEndDate))
                             .eq(Objects.nonNull(transportId) && (3 == transportId || 4 == transportId) &&
                                     null != channelId && 0 != channelId, ProductPriceDO::getShippingChannelId, channelId)
                             .eq(ProductPriceDO::getDeleted, false)
@@ -698,7 +695,9 @@ public class ProdCostCalculation {
                     log.info("===== 线路无牌无液无电价：{} =====",
                             JSONObject.toJSONString(productPriceDO));
                 }
-                if (productPriceDO.getBlacklist() == 1 || productPriceDO.getAuditStatus() == 1) {
+                if (productPriceDO.getBlacklist() == 1 ||
+                        productPriceDO.getAuditStatus() == 1) {
+
                     String lineName = I18nMessage.getLang() == 1 ? "unknown to unknown" : "未知到未知";
                     LogisticsInfoDto logisticsInfoDto =
                             warehouseLineMapper.getStartInfoAndDestInfoByLineId(lineId);
@@ -818,7 +817,7 @@ public class ProdCostCalculation {
                                 " 渠道channelId=" + channelId;
                         z.setTestname(s);
                         zTestMapper.insert(z);
-
+                        //空运阶梯价计算
                         this.airStepSelect(unitDOMap, prodParam,
                                 productPriceDO, lineId, channelId);
                     }
@@ -882,13 +881,16 @@ public class ProdCostCalculation {
                     // 获取路线商品特殊价格需求和指定包装类型的包装加价
                     if (productPriceDO.getStepPrice() == 1) {
                         // TODO 指定包装类型的包装加价
+                        //包装类型
                         if (CollectionUtil.isNotEmpty(prodParam.getPackages())) {
+                            //ecw_product_price_step_packaging
                             stepPackagingPrice(prodParam, productPriceDO);
                         }
-                        // 特性的特殊加价
+                        //特性的特殊加价
                         stepSpecialPrice(attrDOMap, prodParam, productPriceDO);
 
                     } else {
+                        // 全包价
                         // TODO 指定包装类型的包装加价
                         if (CollectionUtil.isNotEmpty(prodParam.getPackages())) {
                             List<ProductPricePackagingDO> pricePackagingDOList =
@@ -1125,41 +1127,74 @@ public class ProdCostCalculation {
     }
 
 
-    private void stepPackagingPrice(ProdConditionParam prodParam, ProductPriceDO productPriceDO) {
+    private void stepPackagingPrice(ProdConditionParam prodParam,
+                                    ProductPriceDO productPriceDO) {
         List<ProductPriceStepPackagingDO> stepPackagingDOList;
         List<ProductPriceStepPackagingDO> clearanceStepPackagingDOList = null;
+
         if (productPriceDO.getPriceType() == 1) {
-            stepPackagingDOList = priceStepPackagingMapper.selectList(new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId, productPriceDO.getAllStepPriceId()));
+
+            stepPackagingDOList = priceStepPackagingMapper.selectList(
+                    new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
+                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                            productPriceDO.getAllStepPriceId()));
         } else {
-            stepPackagingDOList = priceStepPackagingMapper.selectList(new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId, productPriceDO.getTransportStepPriceId()));
+            stepPackagingDOList = priceStepPackagingMapper.selectList(
+                    new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
+                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                            productPriceDO.getTransportStepPriceId()));
+
             if (Objects.nonNull(productPriceDO.getClearanceStepPriceId())) {
-                clearanceStepPackagingDOList = priceStepPackagingMapper.selectList(new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                        .eq(ProductPriceStepPackagingDO::getProductPriceStepId, productPriceDO.getClearanceStepPriceId()));
+                clearanceStepPackagingDOList =
+                        priceStepPackagingMapper.selectList(
+                                new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
+                        .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                                productPriceDO.getClearanceStepPriceId()));
             }
         }
-        if (CollectionUtil.isNotEmpty(stepPackagingDOList) || CollectionUtil.isNotEmpty(clearanceStepPackagingDOList)) {
+
+        if (CollectionUtil.isNotEmpty(stepPackagingDOList) ||
+                CollectionUtil.isNotEmpty(clearanceStepPackagingDOList)) {
             // 包装加价，比较包装类型，并取最大值
-            if (stepPackagingDOList != null && CollectionUtil.isNotEmpty(stepPackagingDOList)) {
+            if (stepPackagingDOList != null &&
+                    CollectionUtil.isNotEmpty(stepPackagingDOList)) {
                 // 比较最大值
-                ProductPriceStepPackagingDO stepPackagingDO = stepPackagingDOList.stream().filter(step -> StringUtils.isNotBlank(step.getPackagingTypes()) && packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA), prodParam.getPackages())).max(Comparator.comparing(ProductPriceStepPackagingDO::getPackagingPrice)).orElse(null);
+                ProductPriceStepPackagingDO stepPackagingDO =
+                        stepPackagingDOList.stream().filter(
+                                step -> StringUtils.isNotBlank(step.getPackagingTypes()) &&
+                                packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA),prodParam.getPackages())).
+                                max(Comparator.comparing(ProductPriceStepPackagingDO::getPackagingPrice)).orElse(null);
                 if (Objects.nonNull(stepPackagingDO)) {
-                    prodParam.setPackagingFreightPrice(stepPackagingDO.getPackagingPrice());
+                    prodParam.setPackagingFreightPrice(
+                            stepPackagingDO.getPackagingPrice());
+
                     if (!prodParam.getSpecialPriceType()) {
-                        prodParam.setOneFreight(prodParam.getOneFreight().add(stepPackagingDO.getPackagingPrice()));
+                        //运费单价，加包装价格
+                        prodParam.setOneFreight(prodParam.getOneFreight().
+                                add(stepPackagingDO.getPackagingPrice()));
                     }
                 } else {
                     prodParam.setPackagingFreightPrice(BigDecimal.ZERO);
                 }
             }
-            if (clearanceStepPackagingDOList != null && CollectionUtil.isNotEmpty(clearanceStepPackagingDOList)) {
+
+            if (clearanceStepPackagingDOList != null &&
+                    CollectionUtil.isNotEmpty(clearanceStepPackagingDOList)) {
                 // 比较最大值
-                ProductPriceStepPackagingDO clearanceStepPackagingDO = clearanceStepPackagingDOList.stream().filter(step -> StringUtils.isNotBlank(step.getPackagingTypes()) && packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA), prodParam.getPackages())).max(Comparator.comparing(ProductPriceStepPackagingDO::getPackagingPrice)).orElse(null);
+                ProductPriceStepPackagingDO clearanceStepPackagingDO =
+                        clearanceStepPackagingDOList.stream().
+                                filter(step -> StringUtils.isNotBlank(
+                                        step.getPackagingTypes())
+                                        &&
+                                        packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA), prodParam.getPackages())).
+                                max(Comparator.comparing(ProductPriceStepPackagingDO::getPackagingPrice)).orElse(null);
+
                 if (Objects.nonNull(clearanceStepPackagingDO)) {
                     prodParam.setPackagingClearanceFeePrice(clearanceStepPackagingDO.getPackagingPrice());
                     if (!prodParam.getSpecialPriceType()) {
-                        prodParam.setOneClearanceFee(prodParam.getOneClearanceFee().add(clearanceStepPackagingDO.getPackagingPrice()));
+                        //清关价单价 加包装价
+                        prodParam.setOneClearanceFee(prodParam.getOneClearanceFee().
+                                add(clearanceStepPackagingDO.getPackagingPrice()));
                     }
                 } else {
                     prodParam.setPackagingClearanceFeePrice(BigDecimal.ZERO);
@@ -1555,7 +1590,7 @@ public class ProdCostCalculation {
                 }
 
                 if (lineClearanceBasePrice != null) {
-                    /*
+
                     int result = 0;
                     if (!clearanceBasePrice.getClearancePriceUnit().
                             equals(lineClearanceBasePrice.getClearancePriceUnit())) {
@@ -1576,12 +1611,13 @@ public class ProdCostCalculation {
                         result = clearanceBasePrice.getClearancePrice().
                                 compareTo(lineClearanceBasePrice.getClearancePrice());
                     }
+                    //清关费来源
                     airClearanceSource = result >= 0 ? 3 : 4;
 
                     clearancePrice = result >= 0 ? clearanceBasePrice :
                             lineClearanceBasePrice;
-                     */
-                    clearancePrice=lineClearanceBasePrice;
+
+                    //clearancePrice=lineClearanceBasePrice;
 
                 } else {
                     clearancePrice = clearanceBasePrice;
@@ -1596,7 +1632,6 @@ public class ProdCostCalculation {
                 clearancePrice = clearanceBasePrice;
             }
             //设置清关价
-            //lanbm 2024-06-21 注释此处
             zTest3 z = new zTest3();
             z.setCreatedate(new Date());
             z.setTestname("计算出的清关价为：" +

yudao-module-product/yudao-module-product-rest/src/main/java/cn/iocoder/yudao/module/product/controller/admin/prod/ProdLinePriceController.java

@@ -46,7 +46,7 @@ public class ProdLinePriceController {
     public CommonResult<CalculationCostResultDto> calculationProdCost(
             @RequestBody ConditionParam param) {
 
-        //lanbm 2024-06-20 记录的参数日志
+        //记录的参数日志
         //String listToString = JSON.toJSONString(param);
         //JsonUtils.SaveLog(listToString);
 

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/downloadLog/DownloadLogServiceImpl.java

@@ -344,22 +344,22 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
                 shipmentSummeryExcelExportPushEvent(downloadLog);
                 break;
             case SHIPMENT_SEA_PRELOAD_EXCEL_EXPORT:
-                //海运预装单导出，lanbm 2024-05-22 添加注释
+                //海运预装单导出
                 shipmentSeaPreloadExcelExportPushEvent(downloadLog);
                 break;
             case SHIPMENT_AIR_LOAD_EXCEL_EXPORT:
-                //空运预装单 lanbm 2024-05-22 添加注释
+                //空运预装单
                 shipmentAirLoadExcelExportPushEvent(downloadLog);
                 break;
             case ACHIEVEMENT_DETAIL_EXCEL_EXPORT:
                 achievementDetailExcelExportPushEvent(downloadLog);
                 break;
             case REPORT_CSSTOMER_ANALYSIS:
-                //客户分析报表 lanbm 2024-05-01 add
+                //客户分析报表
                 REPORT_CSSTOMER_ANALYSIS_Event(downloadLog);
                 break;
             case REPORT_SALES_ANALYSIS:
-                //销售分析报表  lanbm 2024-05-01 add
+                //销售分析报表
                 REPORT_SALES_ANALYSIS_Event(downloadLog);
                 break;
             default:

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/payable/PayableController.java

@@ -34,7 +34,6 @@ public class PayableController {
     @ApiOperation("创建应付款")
     //@PreAuthorize("@ss.hasPermission('ecw:payable:create')")
     public CommonResult<Long> createPayable(@Valid @RequestBody PayableCreateReqVO createReqVO) {
-        //lanbm 2024-05-17 添加费用产生时间字段
         String s="";
         return success(payableService.createPayable(createReqVO));
     }
@@ -80,7 +79,6 @@ public class PayableController {
     @ApiOperation("应付款分页列表，添加供应商未付款项列表 两个用这一个查询")
     //@PreAuthorize("@ss.hasPermission('ecw:payable:query')")
     public CommonResult<PageResult<PayableOrderBackVo>> getPayablePage(@Valid PayableQueryVO query, PageVO page) {
-        //lanbm 2024-05-17 修改问题点
         PageResult<PayableOrderBackVo> result = payableService.getPayablePage(query, page);
         return success(result);
     }

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receivable/ReceivableController.java

@@ -65,7 +65,6 @@ public class ReceivableController {
     @ApiImplicitParam(name = "id", value = "订单ID", required = true, example = "1024", dataTypeClass = Long.class)
     public CommonResult<List<ReceivableBackVO>> getReceivableListByOrderId(
             @RequestParam("id") Long id) {
-        //lanbm 2024-06-20 添加注释
         return success(receivableService.getReceivableListByOrderId(id));
     }
 

yudao-module-wealth/yudao-module-wealth-rest/src/main/resources/mapper/receipt/ReceiptMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.iocoder.yudao.module.wealth.dal.mysql.receipt.ReceiptMapper">
 
     <select id="getReceiptBackPage" resultType="cn.iocoder.yudao.module.wealth.vo.receipt.ReceiptBackVO">
-        <!--lanbm 2024-05-29  添加关联订单和应收款表的关联-->
+        <!--添加关联订单和应收款表的关联-->
         select er.*,rb.order_no as orderNo,o.tidan_no as tidanNo,
         rb.order_id as orderId
         from ecw_receipt er left join ecw_receivable rb