diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java index 4632e811..0bd36bcc 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -56,7 +56,8 @@ public interface HighOrderMapper extends HighOrderMapperExt { "Identification_code, profit_sharing_status, ", "profit_sharing_ratio, account_merchant_num, ", "print_status, print_num, ", - "ext_1, ext_2, ext_3)", + "region_id, ext_1, ", + "ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ", "#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ", "#{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", @@ -74,7 +75,8 @@ public interface HighOrderMapper extends HighOrderMapperExt { "#{identificationCode,jdbcType=BIGINT}, #{profitSharingStatus,jdbcType=BIT}, ", "#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ", "#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{regionId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighOrder record); @@ -120,6 +122,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), + @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @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) @@ -133,8 +136,8 @@ public interface HighOrderMapper extends HighOrderMapperExt { "pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ", "pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_time, refund_price, ", "refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ", - "profit_sharing_ratio, account_merchant_num, print_status, print_num, ext_1, ", - "ext_2, ext_3", + "profit_sharing_ratio, account_merchant_num, print_status, print_num, region_id, ", + "ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -174,6 +177,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), + @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @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) @@ -225,6 +229,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR},", "print_status = #{printStatus,jdbcType=BIT},", "print_num = #{printNum,jdbcType=INTEGER},", + "region_id = #{regionId,jdbcType=VARCHAR},", "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/HighOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java index 55ed3ed1..934842ec 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -164,6 +164,10 @@ public class HighOrderSqlProvider { sql.VALUES("print_num", "#{printNum,jdbcType=INTEGER}"); } + if (record.getRegionId() != null) { + sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -220,6 +224,7 @@ public class HighOrderSqlProvider { sql.SELECT("account_merchant_num"); sql.SELECT("print_status"); sql.SELECT("print_num"); + sql.SELECT("region_id"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -380,6 +385,10 @@ public class HighOrderSqlProvider { sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); } + if (record.getRegionId() != null) { + sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -435,6 +444,7 @@ public class HighOrderSqlProvider { sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}"); sql.SET("print_status = #{record.printStatus,jdbcType=BIT}"); sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); + sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -584,6 +594,10 @@ public class HighOrderSqlProvider { sql.SET("print_num = #{printNum,jdbcType=INTEGER}"); } + if (record.getRegionId() != null) { + sql.SET("region_id = #{regionId,jdbcType=VARCHAR}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index 736a7b4f..a41be3cf 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -3,7 +3,6 @@ package com.hai.entity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * high_order @@ -190,42 +189,17 @@ public class HighOrder implements Serializable { */ private Integer printNum; + /** + * 区域编码 + */ + private String regionId; + private String ext1; private String ext2; private String ext3; - private List highChildOrderList; - - private HighDiscount highDiscount; - - private Boolean isTyAgent; - - public List getHighChildOrderList() { - return highChildOrderList; - } - - public void setHighChildOrderList(List highChildOrderList) { - this.highChildOrderList = highChildOrderList; - } - - public HighDiscount getHighDiscount() { - return highDiscount; - } - - public void setHighDiscount(HighDiscount highDiscount) { - this.highDiscount = highDiscount; - } - - public Boolean getIsTyAgent() { - return isTyAgent; - } - - public void setIsTyAgent(Boolean tyAgent) { - isTyAgent = tyAgent; - } - private static final long serialVersionUID = 1L; public Long getId() { @@ -508,6 +482,14 @@ public class HighOrder implements Serializable { this.printNum = printNum; } + public String getRegionId() { + return regionId; + } + + public void setRegionId(String regionId) { + this.regionId = regionId; + } + public String getExt1() { return ext1; } @@ -579,6 +561,7 @@ public class HighOrder implements Serializable { && (this.getAccountMerchantNum() == null ? other.getAccountMerchantNum() == null : this.getAccountMerchantNum().equals(other.getAccountMerchantNum())) && (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus())) && (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum())) + && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) && (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())); @@ -623,6 +606,7 @@ public class HighOrder implements Serializable { result = prime * result + ((getAccountMerchantNum() == null) ? 0 : getAccountMerchantNum().hashCode()); result = prime * result + ((getPrintStatus() == null) ? 0 : getPrintStatus().hashCode()); result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode()); + result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().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()); @@ -670,6 +654,7 @@ public class HighOrder implements Serializable { sb.append(", accountMerchantNum=").append(accountMerchantNum); sb.append(", printStatus=").append(printStatus); sb.append(", printNum=").append(printNum); + sb.append(", regionId=").append(regionId); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); @@ -677,4 +662,4 @@ public class HighOrder implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java index 57377ec1..055db8c7 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -2336,6 +2336,76 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andRegionIdIsNull() { + addCriterion("region_id is null"); + return (Criteria) this; + } + + public Criteria andRegionIdIsNotNull() { + addCriterion("region_id is not null"); + return (Criteria) this; + } + + public Criteria andRegionIdEqualTo(String value) { + addCriterion("region_id =", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotEqualTo(String value) { + addCriterion("region_id <>", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdGreaterThan(String value) { + addCriterion("region_id >", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdGreaterThanOrEqualTo(String value) { + addCriterion("region_id >=", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdLessThan(String value) { + addCriterion("region_id <", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdLessThanOrEqualTo(String value) { + addCriterion("region_id <=", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdLike(String value) { + addCriterion("region_id like", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotLike(String value) { + addCriterion("region_id not like", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdIn(List values) { + addCriterion("region_id in", values, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotIn(List values) { + addCriterion("region_id not in", values, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdBetween(String value1, String value2) { + addCriterion("region_id between", value1, value2, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotBetween(String value1, String value2) { + addCriterion("region_id not between", value1, value2, "regionId"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;