diff --git a/hai-service/src/main/java/com/hai/dao/ApiAmountRecordMapper.java b/hai-service/src/main/java/com/hai/dao/ApiAmountRecordMapper.java index 90ebfffe..f584e27e 100644 --- a/hai-service/src/main/java/com/hai/dao/ApiAmountRecordMapper.java +++ b/hai-service/src/main/java/com/hai/dao/ApiAmountRecordMapper.java @@ -43,18 +43,18 @@ public interface ApiAmountRecordMapper extends ApiAmountRecordMapperExt { "before_amount, after_amount, ", "mch_id, source_type, ", "source_id, source_order_no, ", - "operator_id, operator_name, ", - "create_time, update_time, ", - "`status`, ext_1, ext_2, ", - "ext_3)", + "source_content, operator_id, ", + "operator_name, create_time, ", + "update_time, `status`, ", + "ext_1, ext_2, ext_3)", "values (#{amountType,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL}, ", "#{beforeAmount,jdbcType=DECIMAL}, #{afterAmount,jdbcType=DECIMAL}, ", "#{mchId,jdbcType=VARCHAR}, #{sourceType,jdbcType=INTEGER}, ", "#{sourceId,jdbcType=BIGINT}, #{sourceOrderNo,jdbcType=VARCHAR}, ", - "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{sourceContent,jdbcType=VARCHAR}, #{operatorId,jdbcType=BIGINT}, ", + "#{operatorName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(ApiAmountRecord record); @@ -74,6 +74,7 @@ public interface ApiAmountRecordMapper extends ApiAmountRecordMapperExt { @Result(column="source_type", property="sourceType", jdbcType=JdbcType.INTEGER), @Result(column="source_id", property="sourceId", jdbcType=JdbcType.BIGINT), @Result(column="source_order_no", property="sourceOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="source_content", property="sourceContent", jdbcType=JdbcType.VARCHAR), @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -88,8 +89,8 @@ public interface ApiAmountRecordMapper extends ApiAmountRecordMapperExt { @Select({ "select", "id, amount_type, amount, before_amount, after_amount, mch_id, source_type, source_id, ", - "source_order_no, operator_id, operator_name, create_time, update_time, `status`, ", - "ext_1, ext_2, ext_3", + "source_order_no, source_content, operator_id, operator_name, create_time, update_time, ", + "`status`, ext_1, ext_2, ext_3", "from api_amount_record", "where id = #{id,jdbcType=BIGINT}" }) @@ -103,6 +104,7 @@ public interface ApiAmountRecordMapper extends ApiAmountRecordMapperExt { @Result(column="source_type", property="sourceType", jdbcType=JdbcType.INTEGER), @Result(column="source_id", property="sourceId", jdbcType=JdbcType.BIGINT), @Result(column="source_order_no", property="sourceOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="source_content", property="sourceContent", jdbcType=JdbcType.VARCHAR), @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -133,6 +135,7 @@ public interface ApiAmountRecordMapper extends ApiAmountRecordMapperExt { "source_type = #{sourceType,jdbcType=INTEGER},", "source_id = #{sourceId,jdbcType=BIGINT},", "source_order_no = #{sourceOrderNo,jdbcType=VARCHAR},", + "source_content = #{sourceContent,jdbcType=VARCHAR},", "operator_id = #{operatorId,jdbcType=BIGINT},", "operator_name = #{operatorName,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/hai-service/src/main/java/com/hai/dao/ApiAmountRecordSqlProvider.java b/hai-service/src/main/java/com/hai/dao/ApiAmountRecordSqlProvider.java index a8d9fc25..3fafee4c 100644 --- a/hai-service/src/main/java/com/hai/dao/ApiAmountRecordSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/ApiAmountRecordSqlProvider.java @@ -60,6 +60,10 @@ public class ApiAmountRecordSqlProvider { sql.VALUES("source_order_no", "#{sourceOrderNo,jdbcType=VARCHAR}"); } + if (record.getSourceContent() != null) { + sql.VALUES("source_content", "#{sourceContent,jdbcType=VARCHAR}"); + } + if (record.getOperatorId() != null) { sql.VALUES("operator_id", "#{operatorId,jdbcType=BIGINT}"); } @@ -110,6 +114,7 @@ public class ApiAmountRecordSqlProvider { sql.SELECT("source_type"); sql.SELECT("source_id"); sql.SELECT("source_order_no"); + sql.SELECT("source_content"); sql.SELECT("operator_id"); sql.SELECT("operator_name"); sql.SELECT("create_time"); @@ -171,6 +176,10 @@ public class ApiAmountRecordSqlProvider { sql.SET("source_order_no = #{record.sourceOrderNo,jdbcType=VARCHAR}"); } + if (record.getSourceContent() != null) { + sql.SET("source_content = #{record.sourceContent,jdbcType=VARCHAR}"); + } + if (record.getOperatorId() != null) { sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}"); } @@ -220,6 +229,7 @@ public class ApiAmountRecordSqlProvider { sql.SET("source_type = #{record.sourceType,jdbcType=INTEGER}"); sql.SET("source_id = #{record.sourceId,jdbcType=BIGINT}"); sql.SET("source_order_no = #{record.sourceOrderNo,jdbcType=VARCHAR}"); + sql.SET("source_content = #{record.sourceContent,jdbcType=VARCHAR}"); sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}"); sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -270,6 +280,10 @@ public class ApiAmountRecordSqlProvider { sql.SET("source_order_no = #{sourceOrderNo,jdbcType=VARCHAR}"); } + if (record.getSourceContent() != null) { + sql.SET("source_content = #{sourceContent,jdbcType=VARCHAR}"); + } + if (record.getOperatorId() != null) { sql.SET("operator_id = #{operatorId,jdbcType=BIGINT}"); } diff --git a/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java b/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java index 12181056..8cbe6204 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java +++ b/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java @@ -59,6 +59,11 @@ public class ApiAmountRecord implements Serializable { */ private String sourceOrderNo; + /** + * 来源内容 + */ + private String sourceContent; + /** * 操作人员id */ @@ -173,6 +178,14 @@ public class ApiAmountRecord implements Serializable { this.sourceOrderNo = sourceOrderNo; } + public String getSourceContent() { + return sourceContent; + } + + public void setSourceContent(String sourceContent) { + this.sourceContent = sourceContent; + } + public Long getOperatorId() { return operatorId; } @@ -258,6 +271,7 @@ public class ApiAmountRecord implements Serializable { && (this.getSourceType() == null ? other.getSourceType() == null : this.getSourceType().equals(other.getSourceType())) && (this.getSourceId() == null ? other.getSourceId() == null : this.getSourceId().equals(other.getSourceId())) && (this.getSourceOrderNo() == null ? other.getSourceOrderNo() == null : this.getSourceOrderNo().equals(other.getSourceOrderNo())) + && (this.getSourceContent() == null ? other.getSourceContent() == null : this.getSourceContent().equals(other.getSourceContent())) && (this.getOperatorId() == null ? other.getOperatorId() == null : this.getOperatorId().equals(other.getOperatorId())) && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) @@ -281,6 +295,7 @@ public class ApiAmountRecord implements Serializable { result = prime * result + ((getSourceType() == null) ? 0 : getSourceType().hashCode()); result = prime * result + ((getSourceId() == null) ? 0 : getSourceId().hashCode()); result = prime * result + ((getSourceOrderNo() == null) ? 0 : getSourceOrderNo().hashCode()); + result = prime * result + ((getSourceContent() == null) ? 0 : getSourceContent().hashCode()); result = prime * result + ((getOperatorId() == null) ? 0 : getOperatorId().hashCode()); result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); @@ -307,6 +322,7 @@ public class ApiAmountRecord implements Serializable { sb.append(", sourceType=").append(sourceType); sb.append(", sourceId=").append(sourceId); sb.append(", sourceOrderNo=").append(sourceOrderNo); + sb.append(", sourceContent=").append(sourceContent); sb.append(", operatorId=").append(operatorId); sb.append(", operatorName=").append(operatorName); sb.append(", createTime=").append(createTime); diff --git a/hai-service/src/main/java/com/hai/entity/ApiAmountRecordExample.java b/hai-service/src/main/java/com/hai/entity/ApiAmountRecordExample.java index 9fe00d33..04bed713 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiAmountRecordExample.java +++ b/hai-service/src/main/java/com/hai/entity/ApiAmountRecordExample.java @@ -686,6 +686,76 @@ public class ApiAmountRecordExample { return (Criteria) this; } + public Criteria andSourceContentIsNull() { + addCriterion("source_content is null"); + return (Criteria) this; + } + + public Criteria andSourceContentIsNotNull() { + addCriterion("source_content is not null"); + return (Criteria) this; + } + + public Criteria andSourceContentEqualTo(String value) { + addCriterion("source_content =", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentNotEqualTo(String value) { + addCriterion("source_content <>", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentGreaterThan(String value) { + addCriterion("source_content >", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentGreaterThanOrEqualTo(String value) { + addCriterion("source_content >=", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentLessThan(String value) { + addCriterion("source_content <", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentLessThanOrEqualTo(String value) { + addCriterion("source_content <=", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentLike(String value) { + addCriterion("source_content like", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentNotLike(String value) { + addCriterion("source_content not like", value, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentIn(List values) { + addCriterion("source_content in", values, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentNotIn(List values) { + addCriterion("source_content not in", values, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentBetween(String value1, String value2) { + addCriterion("source_content between", value1, value2, "sourceContent"); + return (Criteria) this; + } + + public Criteria andSourceContentNotBetween(String value1, String value2) { + addCriterion("source_content not between", value1, value2, "sourceContent"); + return (Criteria) this; + } + public Criteria andOperatorIdIsNull() { addCriterion("operator_id is null"); return (Criteria) this;