Merge remote-tracking branch 'origin/dev_yy' into dev_yy

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

@@ -45,7 +45,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
         "create_time, update_time, ",
         "`status`, ext_1, ext_2, ",
         "ext_3)",
-        "values (#{companyId,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, ",
+        "values (#{companyId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}, ",
         "#{productId,jdbcType=BIGINT}, #{percentage,jdbcType=DECIMAL}, ",
         "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
@@ -63,7 +63,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
-        @Result(column="type", property="type", jdbcType=JdbcType.VARCHAR),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
         @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
@@ -87,7 +87,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
-        @Result(column="type", property="type", jdbcType=JdbcType.VARCHAR),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
         @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
@@ -113,7 +113,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
     @Update({
         "update bs_integral_rebate",
         "set company_id = #{companyId,jdbcType=BIGINT},",
-          "`type` = #{type,jdbcType=VARCHAR},",
+          "`type` = #{type,jdbcType=INTEGER},",
           "product_id = #{productId,jdbcType=BIGINT},",
           "percentage = #{percentage,jdbcType=DECIMAL},",
           "operator_id = #{operatorId,jdbcType=BIGINT},",

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

@@ -33,7 +33,7 @@ public class BsIntegralRebateSqlProvider {
         }
         
         if (record.getType() != null) {
-            sql.VALUES("`type`", "#{type,jdbcType=VARCHAR}");
+            sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
         }
         
         if (record.getProductId() != null) {
@@ -124,7 +124,7 @@ public class BsIntegralRebateSqlProvider {
         }
         
         if (record.getType() != null) {
-            sql.SET("`type` = #{record.type,jdbcType=VARCHAR}");
+            sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
         }
         
         if (record.getProductId() != null) {
@@ -177,7 +177,7 @@ public class BsIntegralRebateSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
-        sql.SET("`type` = #{record.type,jdbcType=VARCHAR}");
+        sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
         sql.SET("product_id = #{record.productId,jdbcType=BIGINT}");
         sql.SET("percentage = #{record.percentage,jdbcType=DECIMAL}");
         sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}");
@@ -203,7 +203,7 @@ public class BsIntegralRebateSqlProvider {
         }
         
         if (record.getType() != null) {
-            sql.SET("`type` = #{type,jdbcType=VARCHAR}");
+            sql.SET("`type` = #{type,jdbcType=INTEGER}");
         }
         
         if (record.getProductId() != null) {

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

@@ -27,7 +27,7 @@ public class BsIntegralRebate implements Serializable {
     /**
      * 1:卡券 2:在线加油 3:话费 4:第三方
      */
-    private String type;
+    private Integer type;
 
     /**
      * 产品id
@@ -97,11 +97,11 @@ public class BsIntegralRebate implements Serializable {
         this.companyId = companyId;
     }
 
-    public String getType() {
+    public Integer getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 

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

@@ -256,62 +256,52 @@ public class BsIntegralRebateExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeEqualTo(String value) {
+        public Criteria andTypeEqualTo(Integer value) {
             addCriterion("`type` =", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotEqualTo(String value) {
+        public Criteria andTypeNotEqualTo(Integer value) {
             addCriterion("`type` <>", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeGreaterThan(String value) {
+        public Criteria andTypeGreaterThan(Integer value) {
             addCriterion("`type` >", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
             addCriterion("`type` >=", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeLessThan(String value) {
+        public Criteria andTypeLessThan(Integer value) {
             addCriterion("`type` <", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeLessThanOrEqualTo(String value) {
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
             addCriterion("`type` <=", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeLike(String value) {
-            addCriterion("`type` like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotLike(String value) {
-            addCriterion("`type` not like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeIn(List<String> values) {
+        public Criteria andTypeIn(List<Integer> values) {
             addCriterion("`type` in", values, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotIn(List<String> values) {
+        public Criteria andTypeNotIn(List<Integer> values) {
             addCriterion("`type` not in", values, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeBetween(String value1, String value2) {
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
             addCriterion("`type` between", value1, value2, "type");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotBetween(String value1, String value2) {
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
             addCriterion("`type` not between", value1, value2, "type");
             return (Criteria) this;
         }