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

hai-service/src/main/java/com/hai/dao/ApiMemberProductMapper.java

@@ -48,7 +48,7 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
         "ext_3)",
         "values (#{name,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, ",
         "#{brandId,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, ",
-        "#{productId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, ",
+        "#{productId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, ",
         "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
@@ -68,7 +68,7 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
         @Result(column="type_id", property="typeId", jdbcType=JdbcType.INTEGER),
         @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
         @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
-        @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
+        @Result(column="product_id", property="productId", jdbcType=JdbcType.VARCHAR),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
@@ -94,7 +94,7 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
         @Result(column="type_id", property="typeId", jdbcType=JdbcType.INTEGER),
         @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
         @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
-        @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
+        @Result(column="product_id", property="productId", jdbcType=JdbcType.VARCHAR),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
@@ -122,7 +122,7 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
           "type_id = #{typeId,jdbcType=INTEGER},",
           "brand_id = #{brandId,jdbcType=INTEGER},",
           "price = #{price,jdbcType=DECIMAL},",
-          "product_id = #{productId,jdbcType=BIGINT},",
+          "product_id = #{productId,jdbcType=VARCHAR},",
           "sort = #{sort,jdbcType=INTEGER},",
           "operator_id = #{operatorId,jdbcType=BIGINT},",
           "operator_name = #{operatorName,jdbcType=VARCHAR},",

hai-service/src/main/java/com/hai/dao/ApiMemberProductSqlProvider.java

@@ -45,7 +45,7 @@ public class ApiMemberProductSqlProvider {
         }
         
         if (record.getProductId() != null) {
-            sql.VALUES("product_id", "#{productId,jdbcType=BIGINT}");
+            sql.VALUES("product_id", "#{productId,jdbcType=VARCHAR}");
         }
         
         if (record.getSort() != null) {
@@ -146,7 +146,7 @@ public class ApiMemberProductSqlProvider {
         }
         
         if (record.getProductId() != null) {
-            sql.SET("product_id = #{record.productId,jdbcType=BIGINT}");
+            sql.SET("product_id = #{record.productId,jdbcType=VARCHAR}");
         }
         
         if (record.getSort() != null) {
@@ -198,7 +198,7 @@ public class ApiMemberProductSqlProvider {
         sql.SET("type_id = #{record.typeId,jdbcType=INTEGER}");
         sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
         sql.SET("price = #{record.price,jdbcType=DECIMAL}");
-        sql.SET("product_id = #{record.productId,jdbcType=BIGINT}");
+        sql.SET("product_id = #{record.productId,jdbcType=VARCHAR}");
         sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
         sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}");
         sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}");
@@ -235,7 +235,7 @@ public class ApiMemberProductSqlProvider {
         }
         
         if (record.getProductId() != null) {
-            sql.SET("product_id = #{productId,jdbcType=BIGINT}");
+            sql.SET("product_id = #{productId,jdbcType=VARCHAR}");
         }
         
         if (record.getSort() != null) {

hai-service/src/main/java/com/hai/entity/ApiMemberProduct.java

@@ -42,7 +42,7 @@ public class ApiMemberProduct implements Serializable {
     /**
      * 产品id
      */
-    private Long productId;
+    private String productId;
 
     /**
      * 排序
@@ -131,11 +131,11 @@ public class ApiMemberProduct implements Serializable {
         this.price = price;
     }
 
-    public Long getProductId() {
+    public String getProductId() {
         return productId;
     }
 
-    public void setProductId(Long productId) {
+    public void setProductId(String productId) {
         this.productId = productId;
     }
 

hai-service/src/main/java/com/hai/entity/ApiMemberProductExample.java

@@ -446,52 +446,62 @@ public class ApiMemberProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andProductIdEqualTo(Long value) {
+        public Criteria andProductIdEqualTo(String value) {
             addCriterion("product_id =", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdNotEqualTo(Long value) {
+        public Criteria andProductIdNotEqualTo(String value) {
             addCriterion("product_id <>", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdGreaterThan(Long value) {
+        public Criteria andProductIdGreaterThan(String value) {
             addCriterion("product_id >", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdGreaterThanOrEqualTo(Long value) {
+        public Criteria andProductIdGreaterThanOrEqualTo(String value) {
             addCriterion("product_id >=", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdLessThan(Long value) {
+        public Criteria andProductIdLessThan(String value) {
             addCriterion("product_id <", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdLessThanOrEqualTo(Long value) {
+        public Criteria andProductIdLessThanOrEqualTo(String value) {
             addCriterion("product_id <=", value, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdIn(List<Long> values) {
+        public Criteria andProductIdLike(String value) {
+            addCriterion("product_id like", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotLike(String value) {
+            addCriterion("product_id not like", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIn(List<String> values) {
             addCriterion("product_id in", values, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdNotIn(List<Long> values) {
+        public Criteria andProductIdNotIn(List<String> values) {
             addCriterion("product_id not in", values, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdBetween(Long value1, Long value2) {
+        public Criteria andProductIdBetween(String value1, String value2) {
             addCriterion("product_id between", value1, value2, "productId");
             return (Criteria) this;
         }
 
-        public Criteria andProductIdNotBetween(Long value1, Long value2) {
+        public Criteria andProductIdNotBetween(String value1, String value2) {
             addCriterion("product_id not between", value1, value2, "productId");
             return (Criteria) this;
         }