2024-07-03-2提交

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

@@ -4,7 +4,6 @@ import lombok.Data;
 
 /*
  移交，接收时计算客户的业绩类型
- lanbm 2024-05-07 add
  */
 @Data
 public class ReceiveCustomerCalTypeEvent {

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

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /*
- lanbm 2024-05-13 add
  计算订单V值
  */
 @Data

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

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.framework.apollo.core.event.Order;
 import lombok.Data;
 
 /*
- lanbm 2024-05-13 add
  在创建订单或修改订单时计算客户业绩类型
  */
 @Data

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/EcwReportPermissionController.java

@@ -46,7 +46,7 @@ public class EcwReportPermissionController {
     private ErrorCode eCode;
 
     /*
-     权限校验函数 lanbm 2024-04-15 add
+     权限校验函数
      */
     private boolean isRight(EcwReportPermission ecwReportPermission) {
         //单表对象查询

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/SalesReportImpl.java

@@ -430,7 +430,7 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     获取某年某月的最后一天 lanbm 2024-04-16 add
+     获取某年某月的最后一天
      */
     private int getLastDay(int year, int month) {
         YearMonth yearMonth = YearMonth.of(year, month);
@@ -439,7 +439,7 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     对查询日期做初始化处理 lanbm 2024-05-09 add
+     对查询日期做初始化处理
      */
     public SalesReportReq getReq(SalesReportReq Req) throws ParseException {
         int y = getCurYear();

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/task/ReportTask.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /*
- lanbm 2024-04-30 测试定时任务
+  测试定时任务
  */
 @Component
 @TenantJob

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -1210,7 +1210,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                     false);
         }
 
-        //开始处理和此产品价格相关的异常订单 lanbm 2024-05-31 添加注释
+        //开始处理和此产品价格相关的异常订单
         handleOrderException(Collections.singletonList(priceId), true);
     }
 
@@ -1221,7 +1221,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
      */
     private void handleOrderException(List<Long> productPriceIdList,
                                       boolean sync) {
-        //查询产品价格信息 lanbm 2024-05-31 添加注释
+        //查询产品价格信息
         List<ProductPriceDO> priceList =
                 getProductPriceList(productPriceIdList);
         List<ProductPriceDO> needHandleList = new ArrayList<>();
@@ -1513,7 +1513,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
     }
 
     /*
-     检查Redis中是否有正在修改的产品 lanbm 2024-05-29添加注释
+     检查Redis中是否有正在修改的产品
      */
     private void checkUpdatingProduct(List<ProductDO> productList,
                                       List<WarehouseLineDO> warehouseLineList) {

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productPrice/ProductPriceBaseVO.java

@@ -53,7 +53,6 @@ public class ProductPriceBaseVO extends ProductPriceReqBaseVO {
 
     /*
       没有固定价格，每单价格都不一样
-      lanbm 2024-05-28 添加注释
      */
     @ApiModelProperty(value = "是否单询，0-否，1-是")
     private Integer needOrderInquiry;

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

@@ -93,7 +93,6 @@ public class ProductPriceController {
 
     /*
      修改空运价格，在处理价格异常时，处理和此价格关联的订单信息
-     lanbm 2024-05-31 添加注释
      */
     @PutMapping("/updateAir")
     @ApiOperation("更新空运路线产品")

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

@@ -954,7 +954,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                 boxAirCheckoutBackVO.setOperator(getUserName(boxAirCheckoutDO.getCreator()));
                 boxBackVO.setRealNum(boxAirCheckoutDO.getRealNum());
             }
-            //lanbm 2024-05-22
+
             boxBackVO.setPlanNum(getPlanNum(id));
             boxBackVO.setRealNum(getRealNum(id));
 
@@ -972,7 +972,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             }
 
             //到港
-            //lanbm 2024-05-15 修改有多条记录是报错的BUG
+            // 修改有多条记录是报错的BUG
             BoxArrivalAirDO boxArrivalAirDO =
                     boxArrivalAirService.getOne(
                             new LambdaQueryWrapper<BoxArrivalAirDO>()
@@ -2333,7 +2333,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                     .map(BoxBaseBackVO::getId)
                     .collect(Collectors.toList());
 
-            //ecw_box_preload_goods 预装货物 lanbm 2024-05-13 添加注释
+            //ecw_box_preload_goods 预装货物
             Map<Long, BoxGoodsStatistics> shipmentStatisticsMap =
                     boxPreloadGoodsService.getBoxStatistics(idList);
 
@@ -2344,7 +2344,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
 
             Map<Long, CabinetDO> cabinetMap = new HashMap<>();
 
-            //ecw_cabinet 柜型配置 lanbm 2024-05-13 添加注释
+            //ecw_cabinet 柜型配置
             if (CollectionUtils.isNotEmpty(cabinetIdList)) {
                 List<CabinetDO> cabinetDOList = cabinetService.getCabinetList(cabinetIdList);
                 cabinetMap = cabinetDOList.stream()
@@ -2401,7 +2401,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                             channelDO));
                 }
 
-                //统计信息 lanbm2024-05-13 添加注释
+                //统计信息
                 BoxGoodsStatistics boxStatistics =
                         shipmentStatisticsMap.get(shipmentId);
                 boxBackVO.setBoxStatistics(boxStatistics);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxLadingBill/BoxLadingBillServiceImpl.java

@@ -239,13 +239,13 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
         //起运港
         if (boxLadingBillDO.getStartPortId() != null && boxLadingBillDO.getStartPortId() > 0L) {
             String s_loadingPort = "";
-            //lanbm 2024-05-28 添加语言判断
+            // 添加语言判断
             s_loadingPort = dockService.getDock(boxLadingBillDO.getStartPortId()).getTitleEn();
             headMap.put("loadingPort", s_loadingPort);
         }
         //目的港
         if (boxLadingBillDO.getDestPortId() != null && boxLadingBillDO.getDestPortId() > 0L) {
-            //lanbm 2024-05-28 添加语言判断 lan =0 中文 其他英语
+            // 添加语言判断 lan =0 中文 其他英语
             String s_dischargingPort = "";
             s_dischargingPort = dockService.getDock(boxLadingBillDO.getDestPortId()).getTitleEn();
             headMap.put("dischargingPort", s_dischargingPort);