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 ed9356c1..effc4581 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoldRecMapper.java @@ -42,12 +42,14 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { "insert into high_gold_rec (user_id, gold_type, ", "gold, update_time, ", "create_time, res_type, ", - "res_id, remark, `status`, ", + "res_id, res_order_no, ", + "remark, `status`, ", "ext_1, ext_2, ext_3)", "values (#{userId,jdbcType=BIGINT}, #{goldType,jdbcType=BIGINT}, ", "#{gold,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{createTime,jdbcType=TIMESTAMP}, #{resType,jdbcType=INTEGER}, ", - "#{resId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{resId,jdbcType=BIGINT}, #{resOrderNo,jdbcType=VARCHAR}, ", + "#{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -67,6 +69,7 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @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="res_order_no", property="resOrderNo", jdbcType=JdbcType.VARCHAR), @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), @@ -77,8 +80,8 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @Select({ "select", - "id, user_id, gold_type, gold, update_time, create_time, res_type, res_id, remark, ", - "`status`, ext_1, ext_2, ext_3", + "id, user_id, gold_type, gold, update_time, create_time, res_type, res_id, res_order_no, ", + "remark, `status`, ext_1, ext_2, ext_3", "from high_gold_rec", "where id = #{id,jdbcType=BIGINT}" }) @@ -91,6 +94,7 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { @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="res_order_no", property="resOrderNo", jdbcType=JdbcType.VARCHAR), @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), @@ -117,6 +121,7 @@ public interface HighGoldRecMapper extends HighGoldRecMapperExt { "create_time = #{createTime,jdbcType=TIMESTAMP},", "res_type = #{resType,jdbcType=INTEGER},", "res_id = #{resId,jdbcType=BIGINT},", + "res_order_no = #{resOrderNo,jdbcType=VARCHAR},", "remark = #{remark,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", "ext_1 = #{ext1,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 f4ce3002..eafb9532 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoldRecSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoldRecSqlProvider.java @@ -56,6 +56,10 @@ public class HighGoldRecSqlProvider { sql.VALUES("res_id", "#{resId,jdbcType=BIGINT}"); } + if (record.getResOrderNo() != null) { + sql.VALUES("res_order_no", "#{resOrderNo,jdbcType=VARCHAR}"); + } + if (record.getRemark() != null) { sql.VALUES("remark", "#{remark,jdbcType=VARCHAR}"); } @@ -93,6 +97,7 @@ public class HighGoldRecSqlProvider { sql.SELECT("create_time"); sql.SELECT("res_type"); sql.SELECT("res_id"); + sql.SELECT("res_order_no"); sql.SELECT("remark"); sql.SELECT("`status`"); sql.SELECT("ext_1"); @@ -147,6 +152,10 @@ public class HighGoldRecSqlProvider { sql.SET("res_id = #{record.resId,jdbcType=BIGINT}"); } + if (record.getResOrderNo() != null) { + sql.SET("res_order_no = #{record.resOrderNo,jdbcType=VARCHAR}"); + } + if (record.getRemark() != null) { sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); } @@ -183,6 +192,7 @@ public class HighGoldRecSqlProvider { 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("res_order_no = #{record.resOrderNo,jdbcType=VARCHAR}"); sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -226,6 +236,10 @@ public class HighGoldRecSqlProvider { sql.SET("res_id = #{resId,jdbcType=BIGINT}"); } + if (record.getResOrderNo() != null) { + sql.SET("res_order_no = #{resOrderNo,jdbcType=VARCHAR}"); + } + if (record.getRemark() != null) { sql.SET("remark = #{remark,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 d57889ba..d7e61628 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 { /** * 编号 */ @@ -46,7 +44,7 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { private Date createTime; /** - * 来源类型:1.充值 2.订单 3:退款 4:积分返利 101:惠支付积分返利 102:惠支付门店活动差价返利 + * 来源类型:1.充值 2.订单 3.退款 */ private Integer resType; @@ -55,6 +53,11 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { */ private Long resId; + /** + * 来源订单号 + */ + private String resOrderNo; + private String remark; /** @@ -134,6 +137,14 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { this.resId = resId; } + public String getResOrderNo() { + return resOrderNo; + } + + public void setResOrderNo(String resOrderNo) { + this.resOrderNo = resOrderNo; + } + public String getRemark() { return remark; } @@ -194,6 +205,7 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { && (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.getResOrderNo() == null ? other.getResOrderNo() == null : this.getResOrderNo().equals(other.getResOrderNo())) && (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())) @@ -213,6 +225,7 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { 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 + ((getResOrderNo() == null) ? 0 : getResOrderNo().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()); @@ -235,6 +248,7 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { sb.append(", createTime=").append(createTime); sb.append(", resType=").append(resType); sb.append(", resId=").append(resId); + sb.append(", resOrderNo=").append(resOrderNo); sb.append(", remark=").append(remark); sb.append(", status=").append(status); sb.append(", ext1=").append(ext1); @@ -244,4 +258,4 @@ public class HighGoldRec extends HighGoldRecModel implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file 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 ebd3a4d1..5d276520 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGoldRecExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighGoldRecExample.java @@ -605,6 +605,76 @@ public class HighGoldRecExample { return (Criteria) this; } + public Criteria andResOrderNoIsNull() { + addCriterion("res_order_no is null"); + return (Criteria) this; + } + + public Criteria andResOrderNoIsNotNull() { + addCriterion("res_order_no is not null"); + return (Criteria) this; + } + + public Criteria andResOrderNoEqualTo(String value) { + addCriterion("res_order_no =", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoNotEqualTo(String value) { + addCriterion("res_order_no <>", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoGreaterThan(String value) { + addCriterion("res_order_no >", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("res_order_no >=", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoLessThan(String value) { + addCriterion("res_order_no <", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoLessThanOrEqualTo(String value) { + addCriterion("res_order_no <=", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoLike(String value) { + addCriterion("res_order_no like", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoNotLike(String value) { + addCriterion("res_order_no not like", value, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoIn(List values) { + addCriterion("res_order_no in", values, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoNotIn(List values) { + addCriterion("res_order_no not in", values, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoBetween(String value1, String value2) { + addCriterion("res_order_no between", value1, value2, "resOrderNo"); + return (Criteria) this; + } + + public Criteria andResOrderNoNotBetween(String value1, String value2) { + addCriterion("res_order_no not between", value1, value2, "resOrderNo"); + return (Criteria) this; + } + public Criteria andRemarkIsNull() { addCriterion("remark is null"); return (Criteria) this;