Merge remote-tracking branch 'origin/dev' into prod

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiProductLaunchServiceImpl.java

@@ -13,6 +13,7 @@ import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.NoYesEnum;
 import com.yd.common.enums.NoYesEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
+import com.yd.common.utils.ChineseTextConverter;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.product.api.service.*;
 import com.yd.product.api.service.*;
 import com.yd.product.feign.dto.ApiProductLaunchDto;
 import com.yd.product.feign.dto.ApiProductLaunchDto;
@@ -93,6 +94,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
     @Override
     @Override
     public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) {
     public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) {
         Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize());
         Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize());
+        //简体转繁体
+        request.setFTitle(ChineseTextConverter.simplifiedToTraditional(request.getTitle()));
+        //繁体转简体
+        request.setJTitle(ChineseTextConverter.traditionalToSimplified(request.getTitle()));
         IPage<ApiProductLaunchPageResponse> iPage = iProductLaunchService.page(page, request);
         IPage<ApiProductLaunchPageResponse> iPage = iProductLaunchService.page(page, request);
         return Result.success(iPage);
         return Result.success(iPage);
     }
     }

yd-product-feign/src/main/java/com/yd/product/feign/request/productlaunch/ApiProductLaunchPageRequest.java

@@ -23,4 +23,14 @@ public class ApiProductLaunchPageRequest extends PageDto {
      * 标题列表（多个）
      * 标题列表（多个）
      */
      */
     private List<String> titleList;
     private List<String> titleList;
+
+    /**
+     * 繁体
+     */
+    private String fTitle;
+
+    /**
+     * 简体
+     */
+    private String jTitle;
 }
 }

yd-product-service/src/main/resources/mappers/ProductLaunchMapper.xml

@@ -14,7 +14,7 @@
                 </if>
                 </if>
             </if>
             </if>
             <if test="request.title != null and request.title != ''">
             <if test="request.title != null and request.title != ''">
-                and pl.title like concat('%', #{request.title}, '%')
+                and (pl.title like concat('%', #{request.fTitle}, '%') or pl.title like concat('%', #{request.jTitle}, '%'))
             </if>
             </if>
             <if test="request.titleList != null and request.titleList.size > 0">
             <if test="request.titleList != null and request.titleList.size > 0">
                 and pl.title in
                 and pl.title in