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

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

@@ -43,14 +43,16 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt {
         "phone, api_key, mch_id, ",
         "operator_id, operator_name, ",
         "create_time, update_time, ",
-        "amounts, `status`, ",
+        "version, amounts, ",
-        "ext_1, ext_2, ext_3)",
+        "`status`, ext_1, ext_2, ",
+        "ext_3)",
         "values (#{merchantName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, ",
         "#{phone,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, ",
         "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
-        "#{amounts,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
+        "#{version,jdbcType=INTEGER}, #{amounts,jdbcType=DECIMAL}, ",
-        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
+        "#{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(ApiMerchants record);
@@ -71,6 +73,7 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt {
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="version", property="version", jdbcType=JdbcType.INTEGER),
         @Result(column="amounts", property="amounts", jdbcType=JdbcType.DECIMAL),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -82,7 +85,7 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt {
     @Select({
         "select",
         "id, merchant_name, user_name, phone, api_key, mch_id, operator_id, operator_name, ",
-        "create_time, update_time, amounts, `status`, ext_1, ext_2, ext_3",
+        "create_time, update_time, version, amounts, `status`, ext_1, ext_2, ext_3",
         "from api_merchants",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -97,6 +100,7 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt {
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="version", property="version", jdbcType=JdbcType.INTEGER),
         @Result(column="amounts", property="amounts", jdbcType=JdbcType.DECIMAL),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -125,6 +129,7 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt {
           "operator_name = #{operatorName,jdbcType=VARCHAR},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "version = #{version,jdbcType=INTEGER},",
           "amounts = #{amounts,jdbcType=DECIMAL},",
           "`status` = #{status,jdbcType=INTEGER},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",

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

@@ -64,6 +64,10 @@ public class ApiMerchantsSqlProvider {
             sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getVersion() != null) {
+            sql.VALUES("version", "#{version,jdbcType=INTEGER}");
+        }
+        
         if (record.getAmounts() != null) {
             sql.VALUES("amounts", "#{amounts,jdbcType=DECIMAL}");
         }
@@ -103,6 +107,7 @@ public class ApiMerchantsSqlProvider {
         sql.SELECT("operator_name");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
+        sql.SELECT("version");
         sql.SELECT("amounts");
         sql.SELECT("`status`");
         sql.SELECT("ext_1");
@@ -165,6 +170,10 @@ public class ApiMerchantsSqlProvider {
             sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getVersion() != null) {
+            sql.SET("version = #{record.version,jdbcType=INTEGER}");
+        }
+        
         if (record.getAmounts() != null) {
             sql.SET("amounts = #{record.amounts,jdbcType=DECIMAL}");
         }
@@ -203,6 +212,7 @@ public class ApiMerchantsSqlProvider {
         sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("version = #{record.version,jdbcType=INTEGER}");
         sql.SET("amounts = #{record.amounts,jdbcType=DECIMAL}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -254,6 +264,10 @@ public class ApiMerchantsSqlProvider {
             sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getVersion() != null) {
+            sql.SET("version = #{version,jdbcType=INTEGER}");
+        }
+        
         if (record.getAmounts() != null) {
             sql.SET("amounts = #{amounts,jdbcType=DECIMAL}");
         }

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

@@ -64,6 +64,11 @@ public class ApiMerchants implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * 版本号
+     */
+    private Integer version;
+
     /**
      * 账号余额
      */
@@ -171,6 +176,14 @@ public class ApiMerchants implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
     public BigDecimal getAmounts() {
         return amounts;
     }
@@ -233,6 +246,7 @@ public class ApiMerchants implements Serializable {
             && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion()))
             && (this.getAmounts() == null ? other.getAmounts() == null : this.getAmounts().equals(other.getAmounts()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@@ -254,6 +268,7 @@ public class ApiMerchants implements Serializable {
         result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode());
         result = prime * result + ((getAmounts() == null) ? 0 : getAmounts().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@@ -278,6 +293,7 @@ public class ApiMerchants implements Serializable {
         sb.append(", operatorName=").append(operatorName);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", version=").append(version);
         sb.append(", amounts=").append(amounts);
         sb.append(", status=").append(status);
         sb.append(", ext1=").append(ext1);

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

@@ -786,6 +786,66 @@ public class ApiMerchantsExample {
             return (Criteria) this;
         }
 
+        public Criteria andVersionIsNull() {
+            addCriterion("version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIsNotNull() {
+            addCriterion("version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionEqualTo(Integer value) {
+            addCriterion("version =", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotEqualTo(Integer value) {
+            addCriterion("version <>", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionGreaterThan(Integer value) {
+            addCriterion("version >", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionGreaterThanOrEqualTo(Integer value) {
+            addCriterion("version >=", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionLessThan(Integer value) {
+            addCriterion("version <", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionLessThanOrEqualTo(Integer value) {
+            addCriterion("version <=", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIn(List<Integer> values) {
+            addCriterion("version in", values, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotIn(List<Integer> values) {
+            addCriterion("version not in", values, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionBetween(Integer value1, Integer value2) {
+            addCriterion("version between", value1, value2, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotBetween(Integer value1, Integer value2) {
+            addCriterion("version not between", value1, value2, "version");
+            return (Criteria) this;
+        }
+
         public Criteria andAmountsIsNull() {
             addCriterion("amounts is null");
             return (Criteria) this;