增加阿里云搜索productType

src/main/java/com/caimei365/commodity/components/SearchOpenService.java

@@ -224,7 +224,7 @@ public class SearchOpenService {
         config.setStart(num - 1);
         config.setHits(size);
         // 设置搜索结果返回应用中哪些字段
-        config.setFetchFields(Lists.newArrayList("id", "p_id", "p_name", "p_image", "p_brand_name", "p_unit", "p_code", "p_price_flag", "p_price_grade", "p_supplier_id", "p_keyword", "p_act_flag", "p_brand_id"));
+        config.setFetchFields(Lists.newArrayList("id", "p_id", "p_name", "p_image", "p_brand_name", "p_unit", "p_code", "p_price_flag", "p_price_grade", "p_supplier_id", "p_keyword", "p_act_flag", "p_brand_id","p_product_type"));
         // 注意：config子句中的rerank_size参数，在Rank类对象中设置
         // 设置返回格式为json格式
         config.setSearchFormat(SearchFormat.JSON);

src/main/java/com/caimei365/commodity/model/search/ProductDO.java

@@ -74,5 +74,7 @@ public class ProductDO implements Serializable {
     private Integer p_time;
 
     private Integer p_promotions_id;
+    /**商品类型：0其它类型(默认)，1妆字号，2械字号 */
+    private Integer p_product_type;
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei365/commodity/model/search/ProductListVo.java

@@ -76,7 +76,10 @@ public class ProductListVo implements Serializable {
      * 活动状态：1有效，0失效
      */
     private Integer actStatus;
-
+    /**
+     * 商品类型：0其它类型(默认)，1妆字号，2械字号
+     */
+    private Integer productType;
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/caimei365/commodity/utils/Json2PojoUtil.java

@@ -54,6 +54,8 @@ public class Json2PojoUtil {
 //            product.setBeautyActFlag(json.getInt("p_act_flag"));
             /* 品牌id*/
             product.setBrandId(json.getInt("p_brand_id"));
+            /** 商品类型：0其它类型(默认)，1妆字号，2械字号*/
+            product.setProductType(json.getInt("p_product_type"));
             productList.add(product);
         }
         return productList;

src/main/resources/mapper/SearchMapper.xml

@@ -24,6 +24,7 @@
         p.preferredFlag as p_preferred,
         p.productCategory as p_type,
         p.validFlag as p_valid,
+        p.productType as p_product_type,
         br.weights as p_sort,
         DATE_FORMAT(p.ADDTIME,'%Y%m%d') as p_time,
         IFNULL(p.visibility,3) as p_visibility
@@ -292,7 +293,8 @@
         p.priceFlag,
         p.price,
         p.shopID as shopId,
-        p.searchKey as keyword
+        p.searchKey as keyword,
+        p.productType
         from product p
         left join cm_brand as br on p.brandID = br.id
         where p.productCategory = 1