push

yd-csf-service/src/main/java/com/yd/csf/service/dto/CustomerQueryRequest.java

@@ -18,7 +18,7 @@ public class CustomerQueryRequest extends PageDto implements Serializable {
     /**
     /**
      * 客户名称
      * 客户名称
      */
      */
-    @Schema(description = "客户名称")
+    @Schema(description = "客户名称（中文/英文，繁简/大小写）")
     private String name;
     private String name;
 
 
     /**
     /**

yd-csf-service/src/main/java/com/yd/csf/service/model/Customer.java

@@ -34,11 +34,21 @@ public class Customer implements Serializable {
     private String nameCn;
     private String nameCn;
 
 
     /**
     /**
+     * 姓名-中文（简体）
+     */
+    private String nameSc;
+
+    /**
      * 姓名-（拼音/英文，通过中文自动加载全部大写的拼音）
      * 姓名-（拼音/英文，通过中文自动加载全部大写的拼音）
      */
      */
     private String namePyEn;
     private String namePyEn;
 
 
     /**
     /**
+     * 姓名-英文（大小写）
+     */
+    private String nameEnLc;
+
+    /**
      * 证件类型（字典，下拉选择）
      * 证件类型（字典，下拉选择）
      */
      */
     private String documentType;
     private String documentType;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java

@@ -11,6 +11,8 @@ import com.google.gson.reflect.TypeToken;
 import com.yd.base.feign.dto.ApiCertificateDto;
 import com.yd.base.feign.dto.ApiCertificateDto;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
+import com.yd.common.utils.ChineseTextConverter;
+import com.yd.common.utils.EnglishTextUtil;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dao.CustomerMapper;
 import com.yd.csf.service.dao.CustomerMapper;
@@ -69,8 +71,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         String mobile = customerQueryRequest.getMobile();
         String mobile = customerQueryRequest.getMobile();
         String email = customerQueryRequest.getEmail();
         String email = customerQueryRequest.getEmail();
 
 
-        queryWrapper.like(StringUtils.isNotBlank(name), "name_cn", name)
-                .or().like(StringUtils.isNotBlank(name), "name_py_en", name);
+        // 中文转简体
+        String nameSc = ChineseTextConverter.traditionalToSimplified(name);
+        // 英文转小写
+        String nameEnLc = EnglishTextUtil.toLowerCase(name);
+
+        queryWrapper.like(StringUtils.isNotBlank(nameSc), "name_sc", nameSc)
+                .or().like(StringUtils.isNotBlank(nameEnLc), "name_en_lc", nameEnLc);
 
 
         queryWrapper.like(StringUtils.isNotBlank(mobile), "mobile", mobile);
         queryWrapper.like(StringUtils.isNotBlank(mobile), "mobile", mobile);
         queryWrapper.like(StringUtils.isNotBlank(email), "email", email);
         queryWrapper.like(StringUtils.isNotBlank(email), "email", email);
@@ -139,6 +146,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         validCustomer(customer);
         validCustomer(customer);
 
 
         customer.setCustomerBizId(customerBizId);
         customer.setCustomerBizId(customerBizId);
+
+        // 中文转简体
+        String nameSc = ChineseTextConverter.traditionalToSimplified(customerAddRequest.getNameCn());
+        // 英文转小写
+        String nameEnLc = EnglishTextUtil.toLowerCase(customerAddRequest.getNamePyEn());
+
+        customer.setNameSc(nameSc);
+        customer.setNameEnLc(nameEnLc);
         boolean result = customerService.saveOrUpdate(customer);
         boolean result = customerService.saveOrUpdate(customer);
         if (!result) {
         if (!result) {
             throw new BusinessException(ErrorCode.OPERATION_ERROR.getCode(), ErrorCode.OPERATION_ERROR.getMessage());
             throw new BusinessException(ErrorCode.OPERATION_ERROR.getCode(), ErrorCode.OPERATION_ERROR.getMessage());
@@ -245,6 +260,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         // 数据校验
         // 数据校验
         customerService.validCustomer(oldCustomer);
         customerService.validCustomer(oldCustomer);
         // 更新主表
         // 更新主表
+        // 中文转简体
+        String nameSc = ChineseTextConverter.traditionalToSimplified(customerUpdateRequest.getNameCn());
+        // 英文转小写
+        String nameEnLc = EnglishTextUtil.toLowerCase(customerUpdateRequest.getNamePyEn());
+        oldCustomer.setNameSc(nameSc);
+        oldCustomer.setNameEnLc(nameEnLc);
         boolean result = customerService.updateById(oldCustomer);
         boolean result = customerService.updateById(oldCustomer);
         if (StringUtils.isNotBlank(customerUpdateRequest.getNamePyEn())) {
         if (StringUtils.isNotBlank(customerUpdateRequest.getNamePyEn())) {
             fnaService.updateCustomerNameByCustomerBizId(customerUpdateRequest.getNamePyEn(), customerBizId);
             fnaService.updateCustomerNameByCustomerBizId(customerUpdateRequest.getNamePyEn(), customerBizId);