Merge branch 'release-fix' into release

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customer/CustomerComplaintMapper.java

@@ -122,7 +122,7 @@ public interface CustomerComplaintMapper extends BaseMapperX<CustomerComplaintDO
 
             "</script>"
     })
-    List<CustomerComplaintExcelVO> selectList(@Param("query") CustomerComplaintExportReqVO query);
+    List<CustomerComplaintExcelVO> selectExcelList(@Param("query") CustomerComplaintExportReqVO query);
 
 
 }

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customer/CustomerMapper.java

@@ -25,13 +25,13 @@ import java.util.List;
 public interface CustomerMapper extends BaseMapperX<CustomerDO> {
 
     //合并操作日志
-    void doMergeCustomerOperateLog(long customer_id1,long customer_id2);
+    void doMergeCustomerOperateLog(@Param("customer_id1") Long customer_id1, @Param("customer_id2") Long customer_id2);
 
     //合并客户信用日志
-    void doMergeCustomerCreditLog(long customer_id1,long customer_id2);
+    void doMergeCustomerCreditLog(@Param("customer_id1") Long customer_id1, @Param("customer_id2") Long customer_id2);
 
     //合并客户登记日志
-    void doMergeCustomerLevelLog(long customer_id1,long customer_id2);
+    void doMergeCustomerLevelLog(@Param("customer_id1") Long customer_id1, @Param("customer_id2") Long customer_id2);
 
     IPage<CustomerDO> getPage(IPage<CustomerDO> page,
                               @Param(Constants.WRAPPER) Wrapper<CustomerDO> queryWrapper);

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

@@ -131,7 +131,7 @@ public class CustomerComplaintServiceImpl extends AbstractService<CustomerCompla
 
     @Override
     public List<CustomerComplaintExcelVO> getCustomerComplaintList(CustomerComplaintExportReqVO exportReqVO) {
-        return customerComplaintMapper.selectList(exportReqVO);
+        return customerComplaintMapper.selectExcelList(exportReqVO);
     }
 
 }

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

@@ -15,7 +15,7 @@ Content-Type: application/json
 
 
 ### 合并客户
-GET {{baseUrl}}/ecw/customer/mergeCus?customerIdSaved=52009&customerIdDeleted=51966
+GET {{baseUrl}}/ecw/customer/mergeCus?customerIdSaved=52043&customerIdDeleted=52042
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
 Content-Type: application/json

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

+package cn.iocoder.yudao.module.customer.controller.admin.customer;
+
+import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
+
+public interface CustomerMergeService {
+
+    boolean doMergeCus(CustomerDO customerDOSaved,
+               CustomerDO customerDODeleted,
+               long loginUserId);
+}