解决【英文版】首页查询、商家入驻页面查询都不行，查不到结果

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -161,7 +161,7 @@ public class SysCompanyController extends ApiBaseController {
         ParameterObject obj = getParameterObject();
         CompanyReviewed cr = obj.parseBean(CompanyReviewed.class);
         startPage(obj);
-        List<CompanyReviewed> crs =  companyReviewedService.selectEnterPublicityList(cr);
+            List<CompanyReviewed> crs =  companyReviewedService.selectEnterPublicityList(cr);
         return AjaxResult.success(getDataTable(crs));
     }
 

dgtly-apiframework/src/main/java/com/dgtly/apiframework/interceptor/SwitchEnSqlInterceptor.java

@@ -58,7 +58,7 @@ public class SwitchEnSqlInterceptor  implements Interceptor {
                     //旧字段和替换字段长度相同
                     if(newfiles.length==oldfiles.length){
                         for(int i = 0;i<oldfiles.length;i++){
-                            oldsql = oldsql.replaceAll(oldfiles[i],newfiles[i]);
+                            oldsql = oldsql.replaceFirst(oldfiles[i],newfiles[i]);
                         }
                     }
                 }

dgtly-common/src/main/java/com/dgtly/common/utils/TranslateUtil.java

@@ -32,9 +32,8 @@ public class TranslateUtil {
      * @Author: koucx
      * @Date: 2020-03-24
     **/
-    @Deprecated
-    public static String getEnTranslateInfoOld(String msg){
-        String params = "doctype=json&type=AUTO&i="+msg;
+    public static String getEnTranslateInfo(String msg){
+        String params = "doctype=json&type=ZH_CN2EN&i="+msg;
         String enInfo = HttpUtils.sendGet(TRANSLATE_URL_OLD, params);
         /**
          * {
@@ -54,7 +53,6 @@ public class TranslateUtil {
          * 根据以上json串获取相应英文翻译
          *
          */
-        if(enInfo.startsWith("{") && enInfo.endsWith("}")){
             JSONObject object = JSONObject.fromObject(enInfo);
             if(object!=null){
                 JSONArray array = object.getJSONArray("translateResult");
@@ -65,14 +63,13 @@ public class TranslateUtil {
                             JSONObject json = JSONObject.fromObject(o);
                             if(json!=null && json.containsKey("tgt")){
                                 String tgt = json.getString("tgt");
-                                log.info("'"+json.getString("src")+"'翻译后'"+tgt+"'");
+                                System.out.println("'"+json.getString("src")+"'翻译后'"+tgt+"'");
                                 return tgt;
                             }
                         }
                     }
                 }
             }
-        }
         return "";
     }
 
@@ -84,7 +81,7 @@ public class TranslateUtil {
      * @Author: koucx
      * @Date: 2020-03-24
      **/
-    public static String getEnTranslateInfo(String msg){
+    public static String getEnTranslateInfoOld(String msg){
 
         try{
             if(StringUtils.isNotEmpty(msg)){
@@ -107,7 +104,7 @@ public class TranslateUtil {
 
 
     public static void main(String[] args) {
-        System.out.println(getEnTranslateInfo("<p><a>学习</a></p>"));
+        System.out.println(getEnTranslateInfo("<a>learning</a>"));
 
     }
 

dgtly-goods/dgtly-goods-api/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -33,7 +33,10 @@ public class GoodsInfoController extends ApiBaseController {
 
 
     @ApiOperation(value = "商品列表分页")
-    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/page")
     public Object getPasgeList(){
         ParameterObject obj =  getParameterObject();

dgtly-goods/dgtly-goods-common/src/main/resources/mapper/goods/GoodsInfoMapper.xml

@@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and gi.putaway_flag= "1"
             and sc.del_flag=0
             and sc.status=0
-            <if test="name != null  and name != ''"> and (gi.name like concat('%', #{name}, '%') or (gi.name_en like concat('%', #{name}, '%'))</if>
+            <if test="name != null  and name != ''"> and (gi.name like concat('%', #{name}, '%') or gi.name_en like concat('%', #{name}, '%'))</if>
             <if test="companyId != null "> and gi.company_id = #{companyId}</if>
             <if test="typeId != null "> and find_in_set(#{typeId},gt.ancestors) </if>
             <if test="beginPrice != null and beginPrice!='' "> and gi.price &gt;= #{beginPrice}</if>

dgtly-system/src/main/resources/mapper/companyext/CompanyReviewedMapper.xml

@@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join company_examine ce on ce.company_reviewed_id = cr.id
         <where>
             cr.reason=0
-            <if test="companyName != null  and companyName != ''"> and cr.company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyName != null  and companyName != ''"> and (cr.company_name like concat('%', #{companyName}, '%') or cr.company_name_en like concat('%', #{companyName}, '%'))</if>
             <if test="status != null  and status != ''"> and cr.status =#{status}</if>
         </where>
     </select>