diff --git a/hai-service/src/main/java/com/hai/dao/ApiMerchantsMapper.java b/hai-service/src/main/java/com/hai/dao/ApiMerchantsMapper.java index 9d88b0cf..ba57bfbe 100644 --- a/hai-service/src/main/java/com/hai/dao/ApiMerchantsMapper.java +++ b/hai-service/src/main/java/com/hai/dao/ApiMerchantsMapper.java @@ -43,12 +43,14 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt { "phone, api_key, mch_id, ", "operator_id, operator_name, ", "create_time, update_time, ", - "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}, ", - "#{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); @@ -69,6 +71,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="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -78,7 +81,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, ext_1, ext_2, ext_3", + "create_time, update_time, `status`, ext_1, ext_2, ext_3", "from api_merchants", "where id = #{id,jdbcType=BIGINT}" }) @@ -93,6 +96,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="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -119,6 +123,7 @@ public interface ApiMerchantsMapper extends ApiMerchantsMapperExt { "operator_name = #{operatorName,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "`status` = #{status,jdbcType=INTEGER},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR}", diff --git a/hai-service/src/main/java/com/hai/dao/ApiMerchantsSqlProvider.java b/hai-service/src/main/java/com/hai/dao/ApiMerchantsSqlProvider.java index 28b40561..173669ed 100644 --- a/hai-service/src/main/java/com/hai/dao/ApiMerchantsSqlProvider.java +++ b/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.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -95,6 +99,7 @@ public class ApiMerchantsSqlProvider { sql.SELECT("operator_name"); sql.SELECT("create_time"); sql.SELECT("update_time"); + sql.SELECT("`status`"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -155,6 +160,10 @@ public class ApiMerchantsSqlProvider { sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); } + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -185,6 +194,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("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -234,6 +244,10 @@ public class ApiMerchantsSqlProvider { sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); } + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/ApiMerchants.java b/hai-service/src/main/java/com/hai/entity/ApiMerchants.java index 0f8d722f..e7164aee 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiMerchants.java +++ b/hai-service/src/main/java/com/hai/entity/ApiMerchants.java @@ -63,6 +63,11 @@ public class ApiMerchants implements Serializable { */ private Date updateTime; + /** + * 状态 100 正常 。101 禁用 + */ + private Integer status; + /** * ext_1 */ @@ -160,6 +165,14 @@ public class ApiMerchants implements Serializable { this.updateTime = updateTime; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getExt1() { return ext1; } @@ -206,6 +219,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.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); @@ -225,6 +239,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 + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); @@ -247,6 +262,7 @@ public class ApiMerchants implements Serializable { sb.append(", operatorName=").append(operatorName); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); + sb.append(", status=").append(status); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); diff --git a/hai-service/src/main/java/com/hai/entity/ApiMerchantsExample.java b/hai-service/src/main/java/com/hai/entity/ApiMerchantsExample.java index 43c08935..6469c548 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiMerchantsExample.java +++ b/hai-service/src/main/java/com/hai/entity/ApiMerchantsExample.java @@ -785,6 +785,66 @@ public class ApiMerchantsExample { return (Criteria) this; } + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;