Merge branch 'master-fix' into dev

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

@@ -2983,8 +2983,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
     public void updateCustomerByCreateOrder(Long customerId, Long orderId, String orderNo, Date orderCreateTime) {
 
         // //下单未入仓或取消订单，线索客户变成为意向客户, 意向客户需要等下单入仓完成后才转成交客户
-        // CustomerDO customer = customerMapper.selectById(customerId);
-        // if (customer != null) {
+        CustomerDO customer = customerMapper.selectById(customerId);
+        if (customer != null) {
         //     if (customer.getIsNew()) {
         //         OrderCustomerServiceEvent event = new OrderCustomerServiceEvent(customerId, null);
         //         applicationContext.publishEvent(event);
@@ -3048,22 +3048,23 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
         //         customerMapper.updateById(customer);
         //     }
         //
-        //     //纪录日志
-        //     LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        //     CustomerOperateLogCreateReqVO customerOperateLogCreateReqVO = new CustomerOperateLogCreateReqVO()
-        //             .setOperator(loginUser == null ?  null : loginUser.getId())
-        //             .setOperatorName(loginUser == null ?  null : loginUser.getNickname())
-        //             .setCustomerId(customer.getId())
-        //             .setNumber(customer.getNumber())
-        //             .setName(customer.getName())
-        //             .setOrderId(orderId)
-        //             .setOrderNo(orderNo)
-        //             .setOldEstimateEnterOpenSeaTime(oldEstimateEnterOpenSeaTime)
-        //             .setNewEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime())
-        //             .setOperateType(CustomerOperateTypeEnum.ORDER_CREATED.getValue())
-        //             .setRemark("客户下单");
-        //     customerOperateLogService.createOperateLog(customerOperateLogCreateReqVO);
-        // }
+            //纪录日志
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            CustomerOperateLogCreateReqVO customerOperateLogCreateReqVO = new CustomerOperateLogCreateReqVO()
+                    .setOperator(loginUser == null ?  null : loginUser.getId())
+                    .setOperatorName(loginUser == null ?  null : loginUser.getNickname())
+                    .setCustomerId(customer.getId())
+                    .setNumber(customer.getNumber())
+                    .setName(customer.getName())
+                    .setOrderId(orderId)
+                    .setOrderNo(orderNo)
+                    // .setOldEstimateEnterOpenSeaTime(oldEstimateEnterOpenSeaTime)
+                    .setOldEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime())
+                    .setNewEstimateEnterOpenSeaTime(customer.getEstimateEnterOpenSeaTime())
+                    .setOperateType(CustomerOperateTypeEnum.ORDER_CREATED.getValue())
+                    .setRemark("客户下单");
+            customerOperateLogService.createOperateLog(customerOperateLogCreateReqVO);
+        }
 
     }