diff --git a/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java b/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java index e6fff1eb..ed9356c1 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java @@ -40,12 +40,14 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @Insert({ "insert into high_gold_rec (user_id, gold_type, ", - "gold, create_time, ", - "res_type, res_id, remark, ", + "gold, update_time, ", + "create_time, res_type, ", + "res_id, remark, `status`, ", "ext_1, ext_2, ext_3)", "values (#{userId,jdbcType=BIGINT}, #{goldType,jdbcType=BIGINT}, ", - "#{gold,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{resType,jdbcType=INTEGER}, #{resId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, ", + "#{gold,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{resType,jdbcType=INTEGER}, ", + "#{resId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -61,10 +63,12 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="gold_type", property="goldType", jdbcType=JdbcType.BIGINT), @Result(column="gold", property="gold", jdbcType=JdbcType.INTEGER), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="res_type", property="resType", jdbcType=JdbcType.INTEGER), @Result(column="res_id", property="resId", jdbcType=JdbcType.BIGINT), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), + @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) @@ -73,8 +77,8 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @Select({ "select", - "id, user_id, gold_type, gold, create_time, res_type, res_id, remark, ext_1, ", - "ext_2, ext_3", + "id, user_id, gold_type, gold, update_time, create_time, res_type, res_id, remark, ", + "`status`, ext_1, ext_2, ext_3", "from high_gold_rec", "where id = #{id,jdbcType=BIGINT}" }) @@ -83,10 +87,12 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="gold_type", property="goldType", jdbcType=JdbcType.BIGINT), @Result(column="gold", property="gold", jdbcType=JdbcType.INTEGER), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="res_type", property="resType", jdbcType=JdbcType.INTEGER), @Result(column="res_id", property="resId", jdbcType=JdbcType.BIGINT), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), + @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) @@ -107,10 +113,12 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { "set user_id = #{userId,jdbcType=BIGINT},", "gold_type = #{goldType,jdbcType=BIGINT},", "gold = #{gold,jdbcType=INTEGER},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "res_type = #{resType,jdbcType=INTEGER},", "res_id = #{resId,jdbcType=BIGINT},", "remark = #{remark,jdbcType=VARCHAR},", + "`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/HighGoldRecSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGoldRecSqlProvider.java index a5721527..f4ce3002 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoldRecSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoldRecSqlProvider.java @@ -40,6 +40,10 @@ public class HighGoldRecSqlProvider { sql.VALUES("gold", "#{gold,jdbcType=INTEGER}"); } + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getCreateTime() != null) { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } @@ -56,6 +60,10 @@ public class HighGoldRecSqlProvider { sql.VALUES("remark", "#{remark,jdbcType=VARCHAR}"); } + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -81,10 +89,12 @@ public class HighGoldRecSqlProvider { sql.SELECT("user_id"); sql.SELECT("gold_type"); sql.SELECT("gold"); + sql.SELECT("update_time"); sql.SELECT("create_time"); sql.SELECT("res_type"); sql.SELECT("res_id"); sql.SELECT("remark"); + sql.SELECT("`status`"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -121,6 +131,10 @@ public class HighGoldRecSqlProvider { sql.SET("gold = #{record.gold,jdbcType=INTEGER}"); } + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } @@ -137,6 +151,10 @@ public class HighGoldRecSqlProvider { sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); } + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -161,10 +179,12 @@ public class HighGoldRecSqlProvider { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("gold_type = #{record.goldType,jdbcType=BIGINT}"); sql.SET("gold = #{record.gold,jdbcType=INTEGER}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("res_type = #{record.resType,jdbcType=INTEGER}"); sql.SET("res_id = #{record.resId,jdbcType=BIGINT}"); sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); + 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}"); @@ -190,6 +210,10 @@ public class HighGoldRecSqlProvider { sql.SET("gold = #{gold,jdbcType=INTEGER}"); } + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } @@ -206,6 +230,10 @@ public class HighGoldRecSqlProvider { sql.SET("remark = #{remark,jdbcType=VARCHAR}"); } + 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/HighGoldRec.java b/hai-service/src/main/java/com/hai/entity/HighGoldRec.java index 47f3de68..6269a574 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGoldRec.java +++ b/hai-service/src/main/java/com/hai/entity/HighGoldRec.java @@ -1,7 +1,5 @@ package com.hai.entity; -import com.hai.model.HighGoldRecModel; - import java.io.Serializable; import java.util.Date; @@ -14,7 +12,7 @@ import java.util.Date; * 代码由工具生成 * **/ -public class HighGoldRec extends HighGoldRecModel implements Serializable { +public class HighGoldRec implements Serializable { /** * 编号 */ @@ -35,13 +33,18 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { */ private Integer gold; + /** + * 更新时间 + */ + private Date updateTime; + /** * 产生时间 */ private Date createTime; /** - * 来源类型：1.充值 + * 来源类型：1.充值 2.订单 3：退款 4：积分返利 */ private Integer resType; @@ -52,6 +55,11 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { private String remark; + /** + * 1:正常 9：过期 + */ + private Integer status; + private String ext1; private String ext2; @@ -92,6 +100,14 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { this.gold = gold; } + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + public Date getCreateTime() { return createTime; } @@ -124,6 +140,14 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { this.remark = remark; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getExt1() { return ext1; } @@ -164,10 +188,12 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getGoldType() == null ? other.getGoldType() == null : this.getGoldType().equals(other.getGoldType())) && (this.getGold() == null ? other.getGold() == null : this.getGold().equals(other.getGold())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getResType() == null ? other.getResType() == null : this.getResType().equals(other.getResType())) && (this.getResId() == null ? other.getResId() == null : this.getResId().equals(other.getResId())) && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) + && (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())); @@ -181,10 +207,12 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getGoldType() == null) ? 0 : getGoldType().hashCode()); result = prime * result + ((getGold() == null) ? 0 : getGold().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getResType() == null) ? 0 : getResType().hashCode()); result = prime * result + ((getResId() == null) ? 0 : getResId().hashCode()); result = prime * result + ((getRemark() == null) ? 0 : getRemark().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()); @@ -201,10 +229,12 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { sb.append(", userId=").append(userId); sb.append(", goldType=").append(goldType); sb.append(", gold=").append(gold); + sb.append(", updateTime=").append(updateTime); sb.append(", createTime=").append(createTime); sb.append(", resType=").append(resType); sb.append(", resId=").append(resId); sb.append(", remark=").append(remark); + 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/HighGoldRecExample.java b/hai-service/src/main/java/com/hai/entity/HighGoldRecExample.java index 1f3f47da..ebd3a4d1 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGoldRecExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighGoldRecExample.java @@ -365,6 +365,66 @@ public class HighGoldRecExample { return (Criteria) this; } + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; @@ -615,6 +675,66 @@ public class HighGoldRecExample { 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;