feat(tenant): 优化商户管理功能并更新RSA密钥配置

- 将删除商户接口参数从@RequestParam改为@RequestBody并新增TenantDeleteEntity
- 更新应用开发环境配置中的RSA公私钥为有效密钥对
- 修改TenantMapper数据查询方法返回类型为TenantSearchDto而非MerchantTable
- 在MyBatis映射文件中添加对商户表的别名引用并关联国家表查询
- 扩展TenantSearchDto实体类增加国家名称和英文名称字段
- 简化TenantServiceImpl中商户列表查询逻辑移除多余的数据转换操作

uacrd-manager-server/src/main/java/com/crm/manager/controller/MerchantController.java

@@ -64,11 +64,12 @@ public class MerchantController extends BaseLoginController {
 
     /**
      * 删除商户
-     * @param id
+     * @param entity
      * @return
      */
     @PostMapping("/delete")
-    public BaseResultDto delete(@RequestParam Long id) {
+    public BaseResultDto delete(@RequestBody TenantDeleteEntity entity) {
+        Long id = entity.getId();
         return BaseResultDto.success(tenantService.delete(id));
     }
 

uacrd-manager-server/src/main/java/com/crm/manager/dao/mapper/TenantMapper.java

@@ -1,5 +1,6 @@
 package com.crm.manager.dao.mapper;
 
+import com.crm.rely.backend.core.dto.tenant.TenantSearchDto;
 import com.crm.rely.backend.core.entity.tenant.info.TenantSearchEntity;
 import com.crm.rely.backend.core.pojo.table.MerchantTable;
 import org.springframework.stereotype.Repository;
@@ -10,5 +11,5 @@ import java.util.List;
 public interface TenantMapper {
     Integer searchByPageCount(TenantSearchEntity entity);
 
-    List<MerchantTable> searchByPageList(TenantSearchEntity entity);
+    List<TenantSearchDto> searchByPageList(TenantSearchEntity entity);
 }

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/TenantServiceImpl.java

@@ -73,18 +73,13 @@ public class TenantServiceImpl implements TenantService {
             return ResultWithPagerDto.success(pageDto);
         }
         pageDto = PageDto.format(entity, count);
-        List<MerchantTable> merchantTables = tenantMapper.searchByPageList(entity);
-        if (merchantTables == null || merchantTables.size() <= 0) {
+        List<TenantSearchDto> dtos = tenantMapper.searchByPageList(entity);
+        if (dtos == null || dtos.size() <= 0) {
             throw new ServiceException(Constants.SYSTEM_ERROR);
         }
-        List<TenantSearchDto> userInfoSearchDtos = merchantTables.stream().map(table -> {
-            TenantSearchDto dto = new TenantSearchDto();
-            BeanUtils.copyProperties(table, dto);
-            return dto;
-        }).collect(Collectors.toList());
 
 
-        return new BaseResultWithPagerDto(pageDto, userInfoSearchDtos);
+        return new BaseResultWithPagerDto(pageDto, dtos);
     }
 
     @Override

uacrd-manager-server/src/main/resources/mapper/TenantMapper.xml

@@ -4,13 +4,15 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.crm.manager.dao.mapper.TenantMapper">
     <select id="searchByPageCount" resultType="java.lang.Integer">
-        select count(merchant.id) from merchant
+        select count(m.id) from merchant m
         <include refid="selectCondition">
         </include>
     </select>
 
-    <select id="searchByPageList" resultType="com.crm.rely.backend.core.pojo.table.MerchantTable">
-        select id, merchant_code, merchant_name, add_time, add_user, add_ip, modify_time, modify_user, modify_ip, note, email, mobile, address, first_name, last_name, country from merchant
+    <select id="searchByPageList" resultType="com.crm.rely.backend.core.dto.tenant.TenantSearchDto">
+        select m.id, merchant_code, merchant_name, m.add_time, m.add_user, m.add_ip, m.modify_time, m.modify_user,
+        m.modify_ip, m.note, email, mobile, address, first_name, last_name, country,coun.`name` countryName,coun.`en_name` countryEnName from merchant m
+        LEFT JOIN sys_country coun ON coun.code =m.country
         <include refid="selectCondition">
         </include>
         <if test="page != null">
@@ -21,7 +23,7 @@
     <sql id="selectCondition">
         where 1=1
         <if test="merchantName!=null and merchantName!=''">
-            and merchant.merchant_name like concat('%',#{name},'%')
+            and m.merchant_name like concat('%',#{merchantName},'%')
         </if>
     </sql>
 </mapper>

ucard-cloud/src/main/resources/application-dev.yml

@@ -12,8 +12,8 @@ spring:
     broker-url: tcp://localhost:61616
 card:
   rsa:
-    private-key-encrypted: 1234567890
-    public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYX+/yZ/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5Z/+5
+    public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIyrDNkrcE8DjgtGf6mGeOdyPSzkPwe5CKb57kZfDdH2apEtKsIYxYwogpwSzZpfg6UKFZc9fu8eDbASXiFylVkCAwEAAQ==
+    private-key-encrypted: 7Q8jzgokzT1TVi0OIfYcdqDGKbfRsTSsUeNGelZav4nBiSsgWjnBiBWqsNdKBYRqHNGmF7hN7sXsmAMsU+mkj58yD5LDkjsHpPS53o1KAmMBFafMe8tcen7nx5EXBzD5WaAtEDtjOw5DCJ5+BsNBrv1Erd0RAJmjr5BnZzWSB2SNIlvoAW0UcyPj63aeMuzKTkr0RDwS4oKQGx/zH0SSI8TD/4CnrouvRJ6HONpywMq8tqBgDOI9u/RBf8f9CthusjxUZp0hu7aiMri0P6pFoHFmGqp0zPDZy1lbhVI9ts9Du5tjo90NAWg18Hcybf29CK88Bq7Fz1wzAMH2HTkfmo8Zgn+CAMyEnI1BVJlfTJLOfuvpPmIEih+r4RlWpBaTfnyAn78H1PI5buIytBfOoUk+V4NLTZuTmD57WXL7JVkEGbnFDK1wBq+t8gVVgyWiFZ0agqsS463AAMp3iiP/+eTPCITSqKhzEKmYxQgpc1QWvDc2ts5k9epz3cKCz8FP4cCnTUwUMz7duGr2GpHax+BGtA8fwQ3q59EF9WpJpNsQFqx1MHHe/EY38NvpKH1PFFVMAKnVNEZ5TYAgjAspZFGVDoxkiqSLSxQoUG2VVz0=
 web:
   upload-path: /Users/gaochao/IdeaProjects/upload
   front-path: G:\crm\crm-back\crm-custom\front

ucard-core/src/main/java/com/crm/rely/backend/core/dto/tenant/TenantSearchDto.java

@@ -36,4 +36,8 @@ public class TenantSearchDto extends BaseInfoDto {
      * 商户国家
      */
     private String country;
+
+    private String countryName;
+
+    private String countryEnName;
 }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/info/TenantDeleteEntity.java

@@ -0,0 +1,8 @@
+package com.crm.rely.backend.core.entity.tenant.info;
+
+import lombok.Data;
+
+@Data
+public class TenantDeleteEntity {
+    private Long id;
+}