2024-07-03-2提交

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 
 /*
- lanbm 2024-05-07 添加公海捞取是计算客户类型
+  添加公海捞取是计算客户类型
  */
 @Data
 public class CalculateCustomerTypeEvent {

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

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.framework.apollo.core.event.Customer;
 import lombok.Data;
 /*
  发货人代码的客户去向处理逻辑
- lanbm 2024-05-27 add
  */
 @Data
 public class CustomerGoEvent {

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

@@ -122,7 +122,6 @@ public class CustomerReportControl {
 
     /*
     计算百分比
-    lanbm 2024-04-10 add
     */
     private String getPercentage(BigDecimal part, BigDecimal total) {
         BigDecimal percentage = part.divide(total, 2,

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

@@ -189,7 +189,7 @@ public class EcwReportPermissionController {
     public CommonResult<PageResult<EcwReportPermissionResp>> getListPage(@Valid EcwReportPermissionPageReq PageReq) {
         //myBatisPlus分页
         //return success(this.ecwReportPermissionService.getListPage(PageReq));
-        //通过自定义SQL语句分页 lanbm 2024-04-15 add
+        //通过自定义SQL语句分页
         redisHelper.set("123","测试");
         List<String>l=new ArrayList<>();
         l.add("112");

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

@@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.Operation;
 /**
  * (Employee)表控制层
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27 21:25:55
  */
 @RestController

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

@@ -63,7 +63,7 @@ public class SalesAnalysisControl {
 
 
     /*
-    客户分析列表 lanbm 2024-04-02 add
+    客户分析列表
     */
     @GetMapping("/getListPage")
     public CommonResult<PageResult<SalesAnalysisResp>>

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

@@ -98,7 +98,7 @@ public class EcwReportPermissionServiceImpl extends ServiceImpl<EcwReportPermiss
     }
 
     /*
-      自定义的分页函数 lanbm 2024-04-15 add
+      自定义的分页函数
      */
     public PageResult<EcwReportPermissionResp> getListPageCustom(EcwReportPermissionPageReq page) {
 

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

@@ -2231,7 +2231,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
     }
 
     /*
-     发送入仓短信提醒 lanbm 2024-05-04
+     发送入仓短信提醒
      处理异常添加注释
      */
     public void warehouseInSendSms(OrderDO orderDO, boolean isAppend, Date appendInTime) {

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingService.java

@@ -16,7 +16,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 public interface MakeBillOfLadingService extends IService<MakeBillOfLadingDO> {
 
     /*
-     获取提单审批状态 lanbm 2024-06-04 add
+     获取提单审批状态
      */
     String getBpmStatus(String process_instance_id);
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -174,7 +174,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
     private CurrencyApi currencyApi;
 
     /*
-    获取提单审批状态 lanbm 2024-06-04 add
+    获取提单审批状态
     */
     public String getBpmStatus(String process_instance_id) {
         return makeBillOfLadingMapper.getBpmStatus(process_instance_id);
@@ -264,7 +264,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                 orderService.selectOne(OrderDO::getOrderId,
                         createReqVO.getOrderId());
 
-        //lanbm 2024-06-13 取消流程的创建
+        //取消流程的创建
         /*
         String bpmProcessId =
                 bpmCreateServiceFactory.createBmp(
@@ -275,7 +275,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                         createReqVO.getCopyUserId());
         makeBillOfLading.setBpmProcessId(bpmProcessId);
          */
-        //lanbm 2024-05-24 修改为自动审批通过
+        //修改为自动审批通过
         //ecw_make_bill_of_lading
         /*
         PROCESS(1, "处理中"),
@@ -298,9 +298,9 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         // 更新
         MakeBillOfLadingDO updateObj =
                 MakeBillOfLadingConvert.INSTANCE.convert(updateReqVO);
-        //lanbm 2024-05-24 提单直接审批通过
+        // 提单直接审批通过
         updateObj.setStatus(2);
-        //end lanbm 2024-05-24 提单直接审批通过
+        //end  提单直接审批通过
 
         makeBillOfLadingMapper.updateById(updateObj);
         OrderBackVO order = orderQueryService.getOrder(Long.valueOf(makeBillOfLadingMapper.selectById(updateReqVO.getId()).getOrderId()));
@@ -494,7 +494,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                 if (item.getClearanceFreightCurrency() == null ||
                         item.getClearanceFreightCurrency() == 0 ||
                         currencyMap.get(item.getClearanceFreightCurrency()) == null) {
-                    //lanbm 2024-05-07 调整逻辑判断，是币种字段为空则显示0
+                    // 调整逻辑判断，是币种字段为空则显示0
                     //item.getClearanceFreightCurrency() 币种项在数据字典中不存在
                     paramMap.put("clearanceFreight", "0");
                 } else {
@@ -684,7 +684,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         return stringBuffer.toString();
     }
 
-    /* lanbm 2024-05-24 添加注释
+    /*  添加注释
      PROCESS(1, "处理中"),
      APPROVE(2, "通过"),
      REJECT(3, "不通过"),

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxCost/BoxCostBackVO.java

@@ -49,7 +49,6 @@ public class BoxCostBackVO {
     private Long priceUnit;
 
     /*
-     lanbm 2024-05-16 add
      */
     @ExcelProperty("币种")
     @ApiModelProperty(value = "币种")

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxCost/BoxCostBaseVO.java

@@ -43,7 +43,7 @@ public class BoxCostBaseVO {
     private String remarks;
 
     /*
-     费用产生时间 lanbm 2024-05-17 add
+     费用产生时间
      */
     @ApiModelProperty(value = "费用产生日期")
     @NotNull(message = "费用产生日期不能为空")

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/BoxApprovalController.java

@@ -54,7 +54,7 @@ public class BoxApprovalController {
     private OrderApprovalService orderApprovalService;
 
     /*
-      创建出货审批流程 lanbm 2024-06-11 添加注释
+      创建出货审批流程
      */
     @PostMapping("/create")
     @ApiOperation("创建出货审核， use this")