2024-07-03-2提交

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

@@ -207,14 +207,14 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
         // 订单发货人是否人跟进客户经理，有则分配给客户经理待接收，没有则放到待分配客户。
         if (customerService != null) {
             // 发货人客户经理
-            //lanbm 2024-05-28 修改为进入待分配列表
+            // 修改为进入待分配列表
             //修改发货人带来的收货人，进入待分配列表，只需要改此处
             //customerCreateReqVO.setCustomerService(customerService);
             customerCreateReqVO.setCustomerService(null);
             // 第1个发货人客户经理
             //customerCreateReqVO.setConsigneeFirstCustomerService(customerService);
             customerCreateReqVO.setConsigneeFirstCustomerService(null);
-            //end lanbm 2024-05-28 修改为进入待分配列表
+            //end  修改为进入待分配列表
         }
 
 
@@ -2722,7 +2722,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
         Long newCustomerService = loginUserId;
 
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        //保存客户捞取记录 lanbm 2024-05-07 添加注释
+        //保存客户捞取记录
         CustomerOperateLogCreateReqVO customerOperateLogCreateReqVO = new CustomerOperateLogCreateReqVO()
                 .setOperator(loginUser == null ? null : loginUser.getId())
                 .setOperatorName(loginUser == null ? null : loginUser.getNickname())

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CustomerAnalysisExcelExportListener.java

@@ -41,7 +41,7 @@ public class CustomerAnalysisExcelExportListener {
     private CustomerAnalysisService customerAnalysisService;
 
     /**
-     * 客户分析导出监听 lanbm 2024-05-01 add
+     * 客户分析导出监听
      *
      * @param event 编号记录
      */

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

@@ -73,7 +73,7 @@ public interface EcwReportPermissionService extends IService<EcwReportPermission
     PageResult<EcwReportPermission> getListPage(EcwReportPermissionPageReq page);
 
     /*
-      自定义的分页函数 lanbm 2024-04-15 add
+      自定义的分页函数
      */
     PageResult<EcwReportPermissionResp> getListPageCustom (EcwReportPermissionPageReq page);
 

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseDO.java

@@ -180,17 +180,17 @@ public class WarehouseDO extends BaseDO implements Serializable {
 
 
     /*
-     落款信息 lanbm 2024-06-10 add
+     落款信息
      */
     private String lkLeft;
 
     /*
-     落款信息 lanbm 2024-06-10 add
+     落款信息
      */
     private String lkRight;
 
     /*
-    图章名称 lanbm 2024-06-12 add
+    图章名称
     */
     private String tzName;
 

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseLineBindRespVO.java

@@ -71,17 +71,17 @@ public class WarehouseLineBindRespVO extends WarehouseBaseVO {
     private String tempTitleZh;
 
     /*
-    落款信息 lanbm 2024-06-10 add
+    落款信息
     */
     private String lkLeft;
 
     /*
-     落款信息 lanbm 2024-06-10 add
+     落款信息
      */
     private String lkRight;
 
     /*
-    图章名称 lanbm 2024-06-12 add
+    图章名称
     */
     private String tzName;
 

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

@@ -3041,7 +3041,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             z.setTestname("单询价为空");
             z.setCreatedate(new Date());
         }
-        //end lanbm 2024-06-06 添加的逻辑点
+        //end添加的逻辑点
 
         // 渠道重量超限异常 channel_packaging_overweight_exception
         // List<OrderExceptionDO> channelPackagingOverweightExceptionDOList = orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(), orderItemDO.getOrderItemId(), OrderExceptionEnum.CHANNEL_PACKAGING_OVERWEIGHT_EXCEPTION.getKey());
@@ -3053,7 +3053,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(),
                             orderItemDO.getOrderItemId(),
                             OrderExceptionEnum.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION.getKey());
-            //运费加清关价才生成清关费异常 lanbm 2024-06-06 添加注释
+            //运费加清关价才生成清关费异常
             if (orderItemDO.getCharging() == 0 &&
                     (Objects.isNull(orderItemDO.getOriginalClearanceFreight()) ||
                             orderItemDO.getOriginalClearanceFreight().compareTo(BigDecimal.ZERO) == 0)

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

@@ -1666,7 +1666,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                                         new LambdaQueryWrapper<OrderExceptionDO>().
                                                 eq(OrderExceptionDO::getOrderId, orderId).
                                                 eq(OrderExceptionDO::getOrderExceptionType, "order_consignor_exception"));
-                        //先判断到仓确认记录是否存在，不存在才创建 lanbm 2024-06-03 add
+                        //先判断到仓确认记录是否存在，不存在才创建
                         if (CollectionUtil.isEmpty(listOrderException)) {
                             orderExceptionService.createOrderException(orderExceptionCreateReqVO);
                         }

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dto/CostDto.java

@@ -81,7 +81,7 @@ public class CostDto {
     @ApiModelProperty(value = "总体积")
     private BigDecimal totalVolume = BigDecimal.ZERO;
 
-    //lanbm 2024-05-14 修改BUG 报价费要按配置参数中的币种来计算
+    //修改BUG 报价费要按配置参数中的币种来计算
     @ApiModelProperty(value = "美元(USD)保价费")
     private BigDecimal insuranceFee = new BigDecimal("2");
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentAirLoadExcelExportListener.java

@@ -71,7 +71,7 @@ import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.HAVE_NOT
 
 /**
  * 自编号订单excel导出监听
- * 空运已装单数据导出 lanbm 2024-06-10 添加注释
+ * 空运已装单数据导出
  * @author zhengYi
  */
 @Component("ShipmentAirLoadExcelExportListener")

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

@@ -190,7 +190,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
                     Collectors.toMap((DictDataRespDTO::getValue),
                             DictDataRespDTO::getLabel));
         }
-        //end 包装单位 lanbm 2024-06-11 add
+        //end 包装单位
         BoxShippingDO boxShippingDO =
                 boxShippingService.getOne(
                         new LambdaQueryWrapperX<BoxShippingDO>().eq(BoxShippingDO::getShipmentId,
@@ -285,7 +285,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
     }
 
     /*
-     海运提单 lanbm 2024-06-14 添加注释
+     海运提单
      */
     @Override
     public Map<String, String> getBoxLadingBillPdf_2(Long shipmentId) throws Exception {

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

@@ -666,7 +666,7 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
     }
 
     /*
-     海运已装单导出 lanbm 2024-06-10 add
+     海运已装单导出
      */
     private void shipmentLoadExcelExportPushEvent2(DownloadLogDO downloadLog) {
         ShipmentLoadExcelExportPushEvent2 event =
@@ -874,7 +874,7 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
     }
 
     /*
-     销售分析报表 lanbm 2024-05-01 add
+     销售分析报表
      */
     private void REPORT_SALES_ANALYSIS_Event(DownloadLogDO downloadLog) {
         ReportSalesAnalysisExcelExportEvent event =

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/payment/PaymentDO.java

@@ -146,7 +146,6 @@ public class PaymentDO extends BaseDO {
     private String comment;
 
     /*
-   lanbm 2024-05-17 add
    原来的付款备注没有保存
    */
     @ApiModelProperty(value = "付款备注")

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/mysql/receiptAccount/ReceiptAccountMapper.java

@@ -56,7 +56,7 @@ public interface ReceiptAccountMapper extends AbstractMapper<ReceiptAccountDO> {
     }
 
     /*
-     获取核销基准金额 lanbm 2024-06-10 add
+     获取核销基准金额
      */
     @ResultType(BigDecimal.class)
     @Select({

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/mysql/receiptItem/ReceiptItemMapper.java

@@ -70,7 +70,7 @@ public interface ReceiptItemMapper extends AbstractMapper<ReceiptItemDO> {
     }
 
     /*
-     获取已核销金额 lanbm 2024-06-10 添加注释
+     获取已核销金额
      */
     @ResultType(BigDecimal.class)
     @Select({

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/enums/ErrorCodeConstants.java

@@ -32,7 +32,7 @@ public interface ErrorCodeConstants {
     ErrorCode RECEIVABLE_NOT_NULL = new ErrorCode(1004520011, "wealth.receivable_not_null");
 
     /*
-     lanbm 2024-05-20 add
+
      */
     ErrorCode ORDER_ID_NULL = new ErrorCode(1004520011, "订单编号为空");
 

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

@@ -108,7 +108,7 @@ public class FinanceReceiptApproveService {
                 throw exception(RECEIPT_NOT_FOUND);
             }
             ReceiptDO updateReceipt = new ReceiptDO();
-            //lanbm 2024-05-20 add 添加订单ID的修改，不然订单ID就丢失了
+            // 添加订单ID的修改，不然订单ID就丢失了
             updateReceipt.setOrderId(receiptDO.getOrderId());
             updateReceipt.setId(receiptDO.getId());
             updateReceipt.setBmpStatus(result);
@@ -179,7 +179,7 @@ public class FinanceReceiptApproveService {
                 throw exception(RECEIPT_NOT_FOUND);
             }
             ReceiptDO updateReceipt = new ReceiptDO();
-            //lanbm 2024-05-20 add 添加订单ID的修改，不然订单ID就丢失了
+            // 添加订单ID的修改，不然订单ID就丢失了
             updateReceipt.setOrderId(receiptDO.getOrderId());
             updateReceipt.setId(receiptDO.getId());
             updateReceipt.setBmpStatus(result);

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/payable/PayableServiceImpl.java

@@ -120,7 +120,7 @@ public class PayableServiceImpl extends AbstractService<PayableMapper, PayableDO
         queryWrapper.eq(StringUtils.isNotBlank(query.getDepartureId()), "a.start_warehouse_id", query.getDepartureId());
         queryWrapper.eq(StringUtils.isNotBlank(query.getObjectiveId()), "a.dest_warehouse_id", query.getObjectiveId());
 
-        //lanbm 2024-05-22 添加的查询条件
+        //添加的查询条件
         if (query.getBeginCreateTime() != null &&
                 query.getEndCreateTime() != null) {
             if (query.getDateType() == 1) {
@@ -163,7 +163,7 @@ public class PayableServiceImpl extends AbstractService<PayableMapper, PayableDO
         //queryWrapper.between()
         payableMapper.selectListPage(mpPage, queryWrapper);
 
-        //lanbm 2024-05-17 add
+        //
         for (PayableOrderBackVo v : mpPage.getRecords()
         ) {
             if (v.getTransportId() == 1) {

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

@@ -89,7 +89,7 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
             payment.setState(PaymentStatusEnum.DRAFT.getValue());
         }
 
-        //把文件List转字符串存储在数据库中 lanbm 2024-05-31 add
+        //把文件List转字符串存储在数据库中
         String sFilePath= JSONUtil.toJsonStr(createReqVO.getFilelist()) ;
         payment.setFilepath(sFilePath);
 

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

@@ -86,7 +86,7 @@ public class ReceiptItemServiceImpl extends AbstractService<ReceiptItemMapper, R
                         ReceiptDO update = new ReceiptDO();
                         update.setId(receiptDO.getId());
                         update.setState(2);
-                        //lanbm 2024-05-20 add
+                        //
                         update.setOrderId(receiptDO.getOrderId());
                         receiptService.updateById(update);
                     }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payment/PaymentBackVO.java

@@ -144,13 +144,12 @@ public class PaymentBackVO {
     private String comment;
 
     /*
-  实际付款时间 lanbm 2024-05-17 add
+  实际付款时间
   */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date sjfkdate;
 
     /*
-  lanbm 2024-05-17 add
   原来的付款备注没有保存
   */
     @ApiModelProperty(value = "付款备注")
@@ -160,18 +159,18 @@ public class PaymentBackVO {
     private String fkren;
 
     /*
-     核销时间 lanbm 2024-05-17 add
+     核销时间
      */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private  Date hexiaodate;
 
     /*
-     编辑付款单时的备注 lanbm 2024-05-30 add
+     编辑付款单时的备注
      */
     private String editreason;
 
     /*
-     文件列表 lanbm 2024-05-31 add
+     文件列表
      */
     private List<FileModel> filelist;
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receipt/ReceiptBackVO.java

@@ -13,7 +13,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 
 /**
  * 收款单 Response VO
- * lanbm 2024-05-29 添加字段
+ *
  * @author 郑屹
  */
 @Data
@@ -197,7 +197,7 @@ public class ReceiptBackVO {
     private String financeRemark;
 
     /*
-     lanbm 2024-05-14 add
+
      */
     @ExcelProperty("明细状态")
     @ApiModelProperty(value = "明细状态")
@@ -205,7 +205,7 @@ public class ReceiptBackVO {
 
     /**
      * 订单号
-     * lanbm 2024-05-29 add
+     *
      */
     private String orderNo;
 
@@ -216,7 +216,7 @@ public class ReceiptBackVO {
 
 
     /*
-     提单号 lanbm 2024-05-29 add
+     提单号
      */
     private String tidanNo;
 
@@ -226,12 +226,12 @@ public class ReceiptBackVO {
     private String ysShow;
 
     /*
-     实数金额 lanbm 2024-06-06 add
+     实数金额
      */
     private String ssShow;
 
     /*
-     核销比例 lanbm 2024-06-06 add
+     核销比例
      */
     private String hxBiLi;
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemBackVO.java

@@ -102,13 +102,13 @@ public class ReceiptItemBackVO {
     private String bmpId;
 
     /*
-     剩余金额 lanbm 2024-06-10 add
+     剩余金额
      */
     private  String syValue;
 
 
     /*
-   提交审批时间 lanbm 2024-06-07
+   提交审批时间
    */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date createTimeBpm;
@@ -118,7 +118,7 @@ public class ReceiptItemBackVO {
      */
     private String createBpm;
     /*
-     审批通过时间 lanbm 2024-06-07
+     审批通过时间
      */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date updateTimeBpm;

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receipt/ReceiptController.java

@@ -95,8 +95,8 @@ public class ReceiptController {
     @ApiOperation("获得收款单分页")
     //@PreAuthorize("@ss.hasPermission('ecw:receipt:query')")
     public CommonResult<PageResult<ReceiptBackVO>> getReceiptPage(@Valid ReceiptQueryVO query, PageVO page) {
-        //lanbm 2024-05-14 添加收款单明细状态计算功能
-        //lanbm 2024-05-29 添加订单号和提单号的关联展示
+        //添加收款单明细状态计算功能
+        //添加订单号和提单号的关联展示
         PageResult<ReceiptBackVO> pageResult = receiptService.getReceiptPage(query, page);
         return success(pageResult);
     }
@@ -113,7 +113,7 @@ public class ReceiptController {
     @ApiOperation("创建收款单")
     @Idempotent(timeout = 5)
     public CommonResult<Long> createReceipt(@Valid @RequestBody ReceiptCreateReqVO createReqVO) {
-        //lanbm 2024-05-19 添加注释
+        //
         return success(receiptService.createReceipt(createReqVO));
     }
 
@@ -173,7 +173,7 @@ public class ReceiptController {
     }
 
     /*
-     批量收款单核销 lanbm 2024-05-29 add
+     批量收款单核销
      */
     @PostMapping("/financeReceiptWriteOff2")
     @ApiOperation("收款单核销")

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receiptItem/ReceiptItemController.java

@@ -260,7 +260,7 @@ public class ReceiptItemController {
     }
 
     /*
-     收款单反核销 lanbm 2024-05-30 添加注释
+     收款单反核销
      */
     @PostMapping("/financeReceiptItemWriteOffNo")
     @ApiOperation("收款明细反核销")