Merge remote-tracking branch 'origin/release' into release

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

@@ -9,15 +9,13 @@ import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customer.complaint.CustomerComplaintDO;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customer.follow.CustomerFollowDO;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customerContacts.CustomerContactsDO;
+import cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO;
 import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
 import cn.iocoder.yudao.module.customer.service.customer.commission.CustomerCommissionService;
 import cn.iocoder.yudao.module.customer.service.customer.complaint.CustomerComplaintService;
-import cn.iocoder.yudao.module.customer.service.customer.complaint.follow.CustomerFollowService;
 import cn.iocoder.yudao.module.customer.service.customerContacts.CustomerContactsService;
-import cn.iocoder.yudao.module.customer.service.customerCredit.CustomerCreditService;
-import cn.iocoder.yudao.module.customer.service.customerLevel.CustomerLevelService;
+import cn.iocoder.yudao.module.customer.service.customerFollowup.CustomerFollowupService;
 import cn.iocoder.yudao.module.customer.service.customerLevelLog.CustomerLevelLogService;
-import cn.iocoder.yudao.module.customer.service.customerLevelLog.CustomerLevelLogServiceImpl;
 import cn.iocoder.yudao.module.customer.service.customerOperateLog.CustomerOperateLogService;
 import cn.iocoder.yudao.module.customer.vo.customerOperateLog.CustomerOperateLogCreateReqVO;
 import cn.iocoder.yudao.module.ecw.enums.CustomerOperateTypeEnum;
@@ -60,7 +58,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
 
     //客户跟进
     @Resource
-    CustomerFollowService customerFollowService;
+    CustomerFollowupService customerFollowupService;
 
     @Resource
     private CustomerComplaintService customerComplaintService;
@@ -134,7 +132,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
         //合并报价单  2
         doMogeOffer(customerDOSaved, customerDODeleted, loginUserId);
         //合并跟进记录  3
-        doMergeCustomerFollow(customerDOSaved, customerDODeleted, loginUserId);
+        doMergeCustomerFollowup(customerDOSaved, customerDODeleted, loginUserId);
         //合并客户投诉  4
         doMergeCustomerComplaint(customerDOSaved, customerDODeleted, loginUserId);
         //合并产品品牌授权  6
@@ -293,19 +291,19 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
 
 
     //合并客户跟进
-    private void doMergeCustomerFollow(CustomerDO customerDOSaved,
+    private void doMergeCustomerFollowup(CustomerDO customerDOSaved,
                                          CustomerDO customerDODeleted,
                                          long loginUserId) {
         LambdaQueryWrapperX q2 =
-                new LambdaQueryWrapperX<CustomerFollowDO>().
-                        eq(CustomerFollowDO::getCustomerId, customerDODeleted.getId());
-        List<CustomerFollowDO> list = customerFollowService.selectList(q2);
+                new LambdaQueryWrapperX<CustomerFollowupDO>().
+                        eq(CustomerFollowupDO::getCustomerId, customerDODeleted.getId());
+        List<CustomerFollowupDO> list = customerFollowupService.selectList(q2);
         if (CollectionUtil.isEmpty(list)) return;
 
-        for (CustomerFollowDO d : list
+        for (CustomerFollowupDO d : list
         ) {
             d.setCustomerId(customerDOSaved.getId());
-            customerFollowService.updateById(d);
+            customerFollowupService.updateById(d);
         }
     }