Commit df7ba16c authored by lanbaoming's avatar lanbaoming

2024-07-03-2提交

parent 2e398806
......@@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers;
import java.util.List;
/*
model类型转换 lanbm 2024-04-27 add
model类型转换
https://www.cnblogs.com/DDgougou/articles/13365277.html
*/
@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
......@@ -11,7 +11,6 @@ import java.util.List;
/*
客户分析报表
逻辑数据大部分集中在表 ecw_customer
lanbm 2024-03-31 add
*/
@Schema(description = "管理后台 - 客户分析查询参数")
@Data
......
......@@ -14,7 +14,6 @@ import javax.annotation.Resource;
import java.util.Date;
/*
lanbm 2024-05-07 add
*/
@Component("CalculateCustomerType")
@AllArgsConstructor
......@@ -32,7 +31,7 @@ public class CalculateCustomerType {
private OrderServiceExt orderServiceExt;
/**
* 客户捞取监听事件 lanbm 2024-05-07 add
* 客户捞取监听事件
* @param event
*/
@EventListener(CalculateCustomerTypeEvent.class)
......@@ -61,9 +60,9 @@ public class CalculateCustomerType {
} else {
//新客户经理和老客户经理不是同一客户经理
//客户业绩类型=新客户
//不是同一客户经理,不管有无成交记录都要改为新客户 lanbm 2024-05-21 添加业务逻辑备注
//不是同一客户经理,不管有无成交记录都要改为新客户
//一客户经理的客户掉入公海池,
//本人去捞要等48小时,其他客户经理一掉入就可以去捞 lanbm 2024-05-21 添加业务逻辑备注
//本人去捞要等48小时,其他客户经理一掉入就可以去捞
sMsg+=",新老不一致";
customerService.updateCustomerNewOrOld(event.getCustomerId(), true);
}
......
......@@ -24,7 +24,6 @@ import static cn.iocoder.yudao.module.delivery.enums.ErrorCodeConstants.VCONFIG_
/*
计算订单V值计算 海运已装柜,空运已入仓 计算V值
lanbm 2024-05-26 update
*/
@Component("CalculateOrderVValueListener")
@AllArgsConstructor
......
......@@ -24,7 +24,6 @@ import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_NOT_E
/*
计算订单业绩类型监听
lanbm 2024-05-13 add
*/
@Component("CalculateOrderYeJiTypeListener")
@AllArgsConstructor
......
......@@ -6,7 +6,6 @@ import org.springframework.stereotype.Component;
/*
发货人带来的客户的去向处理逻辑
lanbm 2024-05-27 add
*/
@Component("CustomerGoListener")
@AllArgsConstructor
......
......@@ -16,7 +16,6 @@ import java.util.Date;
/*
移交,接收客户是计算客户业绩类型
lanbm 2024-05-07 add
*/
@Component("ReceiveCustomerCalTypeListener")
@AllArgsConstructor
......
......@@ -39,7 +39,7 @@ public class SalesAnalysisExcelExportListener {
private SalesAnalysisService salesAnalysisService;
/**
* 销售分析导出监听 lanbm 2024-05-01 add
* 销售分析导出监听
* 参考网址
*https://www.cnblogs.com/h-java/p/9951547.html
* @param event 编号记录
......
......@@ -24,7 +24,6 @@ public interface CustomerAnalysisMapper {
List<CustomerAnalysisResp> getListPage(CustomerAnalysisReq req);
/*
lanbm 2024-04-26 add
*/
List<CustomerAnalysisResp> getListPage_New(CustomerAnalysisReq req);
......
......@@ -10,7 +10,7 @@ import java.util.List;
/**
* (CustomerReport)客户报表
*
* @author lanbm
* @author
* @since 2024-04-01
*/
@Mapper
......
......@@ -12,7 +12,7 @@ import java.util.List;
/**
* V值转换配置参数(EcwVz)表数据库访问层
*
* @author lanbm
* @author
* @since 2024-04-02 22:38:22
*/
@Mapper
......
......@@ -17,7 +17,7 @@ import javax.validation.Valid;
/**
* V值转换配置参数(EcwVz)表服务实现类
*
* @author lanbm
* @author
* @since 2024-04-02 22:38:22
*/
@Service("ecwVzService")
......
......@@ -32,7 +32,7 @@ public class SalesAnalysisImpl implements SalesAnalysisService {
}
/*
根据原始信息计算逻辑展示信息 lanbm 2024-04-29 add
根据原始信息计算逻辑展示信息
*/
private SalesAnalysisResp calBis(SalesAnalysisResp r) {
String sTemp = "";
......
......@@ -35,13 +35,11 @@ public interface SalesReportService {
/*
统计一段时间内客户成交数目,出重客户
lanbm 2024-05-09 add
*/
SalesReportCusTarget CustomerTargetCount(SalesReportReq Req) throws ParseException;
/*
获取统计图表数据
lanbm 2024-05-14 add
*/
SalesReportBar getCustomerReportBar(SalesReportReq Req) throws ParseException;
......
......@@ -50,17 +50,17 @@ public class WarehouseLineServiceReqVO {
/*
落款信息 lanbm 2024-06-10 add
落款信息
*/
private String lkLeft;
/*
落款信息 lanbm 2024-06-10 add
落款信息
*/
private String lkRight;
/*
图章名称 lanbm 2024-06-12 add
图章名称
*/
private String tzName;
}
......@@ -117,7 +117,7 @@ public class ProductPriceController {
@ApiOperation("批量更新路线产品")
@PreAuthorize("@ss.hasPermission('ecw:product-price:update')")
public CommonResult<Boolean> batchUpdateProductPrice(@RequestBody ProductPriceBatchUpdateReqVo updateReqVO) {
//批量修改价格 lanbm 2024-05-29 添加注释
//批量修改价格
//检查Redis中是否有正在修改的产品价格
ProductPriceCheckAO productPriceCheckAO =
productPriceService.check(updateReqVO);
......@@ -139,7 +139,7 @@ public class ProductPriceController {
@PreAuthorize("@ss.hasPermission('ecw:product-price:update')")
public CommonResult<Boolean> batchAddPrice(@RequestBody ProductPriceBatchAddPriceReqVo updateReqVO) {
//批量修改价格 lanbm 2024-05-23 添加注释
//批量修改价格
updateReqVO.setCheckStepPrice(false);
ProductPriceCheckAO productPriceCheckAO =
productPriceService.check(updateReqVO);
......
......@@ -170,7 +170,7 @@ public class BoxCostController {
boxCostBackVO.setPayableNo(payableDO.getPayableNo());
boxCostBackVO.setPayableId(payableDO.getId());
//判断是否生成付款单 lanbm 2024-06-03
//判断是否生成付款单
if (payableDO.getPaymentId() == null || payableDO.getPaymentId() == 0) {
boxCostBackVO.setPaymentId("-1");
} else {
......@@ -181,7 +181,7 @@ public class BoxCostController {
}
for (BoxCostBackVO boxCostBackVO : costList) {
//lanbm 2024-05-16 添加币种显示 要注意map中key的数据类型
// 添加币种显示 要注意map中key的数据类型
Integer i = Integer.parseInt(boxCostBackVO.getPriceUnit().toString());
String sName = currencyMap.get(i);
boxCostBackVO.setPriceUnitName(sName);
......
......@@ -55,7 +55,6 @@ public class PaymentController {
private PaymentApprovalService paymentApprovalService;
/*
lanbm 2024-05-17 add
*/
@Autowired
private AdminUserService adminUserService;
......@@ -104,14 +103,14 @@ public class PaymentController {
} else {
payment.setFkren("");
}
//lanbm 2024-05-31 添加附件列表字段逻辑
// 添加附件列表字段逻辑
List<FileModel> fileList =
JSONUtil.toList(new JSONArray(payment.getFilepath()),
FileModel.class);
PaymentBackVO vo= PaymentConvert.INSTANCE.convert(payment);
vo.setFilelist(fileList);
//end lanbm 2024-05-31 添加附件列表字段逻辑
//end 添加附件列表字段逻辑
return success(vo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment