Skip to content

J
jiedao-api-boot-master
Commit 768c5a85 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into dev

parents adba3fe8 1a756e50
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 18 deletions
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java
View file @ 768c5a85
...@@ -2983,8 +2983,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, ...@@ -2983,8 +2983,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
public void updateCustomerByCreateOrder(Long customerId, Long orderId, String orderNo, Date orderCreateTime) { public void updateCustomerByCreateOrder(Long customerId, Long orderId, String orderNo, Date orderCreateTime) {
// //下单未入仓或取消订单，线索客户变成为意向客户, 意向客户需要等下单入仓完成后才转成交客户 // //下单未入仓或取消订单，线索客户变成为意向客户, 意向客户需要等下单入仓完成后才转成交客户
// CustomerDO customer = customerMapper.selectById(customerId); CustomerDO customer = customerMapper.selectById(customerId);
// if (customer != null) { if (customer != null) {
// if (customer.getIsNew()) { // if (customer.getIsNew()) {
// OrderCustomerServiceEvent event = new OrderCustomerServiceEvent(customerId, null); // OrderCustomerServiceEvent event = new OrderCustomerServiceEvent(customerId, null);
// applicationContext.publishEvent(event); // applicationContext.publishEvent(event);
...@@ -3048,22 +3048,23 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, ...@@ -3048,22 +3048,23 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
// customerMapper.updateById(customer); // customerMapper.updateById(customer);
// } // }
// //
// //纪录日志 //纪录日志
// LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
// CustomerOperateLogCreateReqVO customerOperateLogCreateReqVO = new CustomerOperateLogCreateReqVO() CustomerOperateLogCreateReqVO customerOperateLogCreateReqVO = new CustomerOperateLogCreateReqVO()
// .setOperator(loginUser == null ? null : loginUser.getId()) .setOperator(loginUser == null ? null : loginUser.getId())
// .setOperatorName(loginUser == null ? null : loginUser.getNickname()) .setOperatorName(loginUser == null ? null : loginUser.getNickname())
// .setCustomerId(customer.getId()) .setCustomerId(customer.getId())
// .setNumber(customer.getNumber()) .setNumber(customer.getNumber())
// .setName(customer.getName()) .setName(customer.getName())
// .setOrderId(orderId) .setOrderId(orderId)
// .setOrderNo(orderNo) .setOrderNo(orderNo)
// .setOldEstimateEnterOpenSeaTime(oldEstimateEnterOpenSeaTime) // .setOldEstimateEnterOpenSeaTime(oldEstimateEnterOpenSeaTime)
// .setNewEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime()) .setOldEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime())
// .setOperateType(CustomerOperateTypeEnum.ORDER_CREATED.getValue()) .setNewEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime())
// .setRemark("客户下单"); .setOperateType(CustomerOperateTypeEnum.ORDER_CREATED.getValue())
// customerOperateLogService.createOperateLog(customerOperateLogCreateReqVO); .setRemark("客户下单");
// } customerOperateLogService.createOperateLog(customerOperateLogCreateReqVO);
}
} }
......
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