2024-07-03-2提交

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java

@@ -242,7 +242,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
 
         customerCreateReqVO.setCustomerContacts(Arrays.asList(customerContactsCreateReqVO));
         //customerCreateReqVO.setCustomerOperateLogRemark("管理端创建收货人时关联创建客户");
-        //lanbm 2024-05-28 修改日志记录信息
+        // 修改日志记录信息
         customerCreateReqVO.setCustomerOperateLogRemark("管理端创建收货人时关联创建客户，进待分配列表");
         customerCreateReqVO.setCustomerOperateLogOrderNo(orderNo);
 
@@ -2625,7 +2625,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void catchCustomer(Long customerId) {
-        //lanbm 2024-05-07 添加客户业绩类型逻辑
+        // 添加客户业绩类型逻辑
         //捞取公海池客户
         CustomerDO customer = customerMapper.selectById(customerId);
         if (customer == null) {
@@ -2821,8 +2821,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
                 applicationContext.publishEvent(new AssignConfirmedCustomerEvent(customerId, customerDO.getCustomerService()));
 
                 //报价成功后就会确认接收客户，所以在此做客户类型逻辑运算
-                //lanbm 2024-05-08 add
-                //lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
+                //
+                //添加接收确认后判断客户是新客户还是老客户逻辑
                 //前面的逻辑有可能改了客户的业绩类型，需要再次获取客户信息
                 CustomerDO customer2 = customerMapper.selectById(customerId);
                 ReceiveCustomerCalTypeEvent event = new ReceiveCustomerCalTypeEvent();
@@ -2830,7 +2830,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
                 event.setCustomerNumber(customer2.getNumber());
                 event.setIsNew(customer2.getIsNew());
                 applicationContext.publishEvent(event);
-                //end lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
+                //end  添加接收确认后判断客户是新客户还是老客户逻辑
             }
         }
     }
@@ -3554,7 +3554,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
 
         if (Objects.equals(customerDO.getIsNew(), isNew)) {
             // throw exception(CUSTOMER_IS_NEW_OR_OLD_NO_CHANGE, isNew ? "新" : "老");
-            //lanbm 2024-05-15 修改此处逻辑，修改客户类型时，不用炮异常，直接不修改就可以了
+            // 修改此处逻辑，修改客户类型时，不用炮异常，直接不修改就可以了
             return;
         }
 

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java

@@ -631,7 +631,6 @@ public class CustomerController {
     //@PreAuthorize("@ss.hasPermission('ecw:customer:query')")
     public CommonResult<PageResult<CustomerRespVO>> getWaitConfirmList(
             @Valid CustomerPageReqDTO customerPageReqVO, PageVO page) {
-        //lanbm 2024-05-26 添加注释
         //customerPageReqVO.setCustomerService(WebFrameworkUtils.getLoginUserId());
         List<Long> setCustomerService = new ArrayList<>();
         setCustomerService.add(WebFrameworkUtils.getLoginUserId());
@@ -671,7 +670,7 @@ public class CustomerController {
     @ApiOperation("获得待分配客户列表")
     //@PreAuthorize("@ss.hasPermission('ecw:customer:query')")
     public CommonResult<PageResult<CustomerRespVO>> getWaitForDistributionList(@Valid CustomerPageReqDTO customerPageReqVO, PageVO page) {
-        //lanbm 2024-05-26 添加注释
+        //
         PageResult<CustomerDO> pageResult =
                 customerService.getWaitToAssignedCustomerPageReq(customerPageReqVO, page);
         return success(CustomerConvert.INSTANCE.convertPage(pageResult));

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/enums/ErrorCodeConstants.java

@@ -9,7 +9,7 @@ public interface ErrorCodeConstants {
 
     //ErrorCode ORDER_NOT_EXISTS = new ErrorCode(2004020002, "订单不存在");
 
-    //lanbm 2024-05-13 add
+    //
     ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(2004020003, "客户不存在");
 
     ErrorCode VCONFIG_NOT_EXISTS = new ErrorCode(2004020004, "V值配置参数不存在");

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/CustomerAnalysisMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * (CustomerAnalysis)客户分析
  *
- * @author lanbm
+ * @author
  * @since 2024-04-01
  */
 @Mapper

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/EcwReportPermissionMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * 报表权限(EcwReportPermission)表数据库访问层
  *
- * @author lanbm
+ * @author
  * @since 2024-04-09 23:10:40
  */
 @Mapper
@@ -27,7 +27,6 @@ public interface EcwReportPermissionMapper extends BaseMapperX<EcwReportPermissi
 
     /*
      简单的单表查询，开发效率高，如果关联多表还是是XML比较好
-     lanbm 2024-04-15 add
      */
     default List<EcwReportPermission> selectList(EcwReportPermission QueryReq) {
         return selectList(new LambdaQueryWrapperX<EcwReportPermission>()

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

@@ -12,7 +12,7 @@ import javax.validation.*;
 /**
  * 报表权限(EcwReportPermission)表服务接口
  *
- * @author lanbm
+ * @author
  * @since 2024-04-09 23:10:42
  */
 public interface EcwReportPermissionService extends IService<EcwReportPermission> {

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

@@ -10,7 +10,7 @@ import javax.validation.*;
 /**
  * V值转换配置参数(EcwVz)表服务接口
  *
- * @author lanbm
+ * @author
  * @since 2024-04-02 22:38:22
  */
 public interface EcwVzService  extends IService< EcwVz > {

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

@@ -11,7 +11,7 @@ import javax.validation.*;
 /**
  * (Employee)表服务接口
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27 21:25:56
  */
 public interface EmployeeService extends IService<Employee> {

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

@@ -33,7 +33,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /*
- lanbm 2024-04-01 add
  客户分析列表
  */
 @Service("CustomerAnalysisService")
@@ -110,7 +109,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
 
     /*
      计算百分比
-     lanbm 2024-04-10 add
      */
     private String getPercentage(BigDecimal part, BigDecimal total) {
         BigDecimal percentage = part.divide(total, 5,
@@ -157,7 +155,7 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
     }
 
     /*
-     对查询逻辑做处理 lanbm 2024-04-16 add
+     对查询逻辑做处理
      */
     public CustomerAnalysisReq getReq(CustomerAnalysisReq Req) {
 
@@ -327,7 +325,7 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
     }
 
     private void setCountry(CustomerAnalysisReq Req) {
-        //设置多选查询条件 lanbm 2024-06-24 add
+        //设置多选查询条件
         if (Req.getCountry() != null && Req.getCountry().size() > 0) {
             if (Req.getCountry().size() == 1) {
                 Req.setCountrystr(Req.getCountry().get(0));
@@ -378,7 +376,7 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
 
 
     /*
-    获取某年某月的最后一天 lanbm 2024-04-16 add
+    获取某年某月的最后一天
     */
     private int getLastDay(int year, int month) {
         YearMonth yearMonth = YearMonth.of(year, month);

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

@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.delivery.entity.orderdata.view_order_businesstime
 import java.util.List;
 
 /*
- 订单业务数据 lanbm 2024-04-25 add
+ 订单业务数据
  */
 public interface view_order_businesstimeService {
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/payment/PaymentServiceImpl.java

@@ -275,7 +275,7 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
         approvalDO.setPaymentNo(financePaymentVo.getPaymentNo());
         approvalDO.setBmpKey(WorkFlowEmus.FINANCE_PAYMENT_APPROVE_NO.getKey());
         approvalDO.setStatus(BpmProcessInstanceResultEnum.PROCESS.getResult());
-        //反审核理由 lanbm 2024-05-17 添加注释
+        //反审核理由
         approvalDO.setReason(financePaymentVo.getReason());
         paymentApprovalService.save(approvalDO);
         Long userId = SecurityFrameworkUtils.getLoginUserId();
@@ -298,7 +298,7 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
         update.setId(financePaymentVo.getPaymentId());
         update.setState(PaymentStatusEnum.WRITE_OFF.getValue());
 
-        //lanbm 2024-05-17 添加字段
+        //
         //付款备注
         update.setReason(financePaymentVo.getReason());
         //实际付款日期

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receipt/ReceiptServiceImpl.java

@@ -109,7 +109,6 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
         }
 
         /*
-         lanbm 2024-05-20 add
          */
         if (createReqVO.getOrderId() == 0) {
             throw exception(ORDER_ID_NULL);
@@ -149,7 +148,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
         }
 
         /*
-         lanbm 2024-05-20 添加订单ID关联字段
+          添加订单ID关联字段
          */
         receipt.setOrderId(createReqVO.getOrderId());
         receiptMapper.insert(receipt);
@@ -174,7 +173,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
             update.setBmpStatus(BpmProcessInstanceResultEnum.PROCESS.getResult());
             update.setState(ReceiptStatusEnum.APPROVE_ING.getValue());
             update.setBmpId(bpmId);
-            //lanbm 2024-05-20 添加关联的订单ID
+            // 添加关联的订单ID
             update.setOrderId(createReqVO.getOrderId());
             receiptMapper.updateById(update);
         }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receiptItem/BankReceiptDetailsImpl.java

@@ -21,7 +21,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /*
- lanbm 2024-05-18 add
  银行收款明细列表
  */
 @Service
@@ -33,7 +32,6 @@ public class BankReceiptDetailsImpl implements BankReceiptDetailsService {
     private BankReceiptDetailsMapper bankReceiptDetailsMapper;
 
     /*
-    lanbm 2024-05-17 add
     */
     @Autowired
     private AdminUserService adminUserService;
@@ -80,7 +78,7 @@ public class BankReceiptDetailsImpl implements BankReceiptDetailsService {
     }
 
     /*
-     组装附件信息 lanbm 2024-06-07 add
+     组装附件信息
      */
     private List<FileModel> getFileList(String sFileStr) {
         if (sFileStr == null || sFileStr.length() == 0) {
@@ -100,7 +98,7 @@ public class BankReceiptDetailsImpl implements BankReceiptDetailsService {
     }
 
     /*
-     分解Url路径 lanbm 2024-06-07 add
+     分解Url路径
      */
     public String getFileName(String s) {
         //String s="https://jiedao-test1.oss-cn-shenzhen.aliyuncs.com/2024/05/31/66592b5b556179746796617e.jpg";

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receiptItem/BankReceiptDetailsService.java

@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.wealth.vo.receiptItem.ReceiptItemResp;
 import java.util.List;
 
 /*
- lanbm 2024-05-18 add
  */
 public interface BankReceiptDetailsService {
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receiptItem/ReceiptItemServiceImpl.java

@@ -140,13 +140,13 @@ public class ReceiptItemServiceImpl extends AbstractService<ReceiptItemMapper, R
                 updateWrapper.eq("receipt_id", receiptItemDO.getReceiptId());
                 this.receivableService.update(updateReceivableDO, updateWrapper);
 
-                //lanbm 2024-06-07 添加的逻辑点
+                //添加的逻辑点
                 //当银行收款明细为0是要改变收款单的状态为 待收款
                 ReceiptDO update = new ReceiptDO();
                 update.setId(receiptItemDO.getReceiptId());
                 update.setState(1);
                 receiptService.updateById(update);
-                //end lanbm 2024-06-07 添加的逻辑点
+                //end 添加的逻辑点
             }
         }
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableServiceImpl.java

@@ -164,7 +164,7 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
         }
         //收款状态（0未收款，1收款中，2已收款）
         if (receivable.getState() != 0) {
-            //lanbm 2024-06-19 取消此逻辑
+            // 取消此逻辑
             //throw exception(RECEIVABLE_WRITE_OFF_ING);
         }
         updateReqVO.setUpdateTime(new Date());