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 eef400f6..05c939b1 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -57,9 +57,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "profit_sharing_status, profit_sharing_ratio, ", "account_merchant_num, product_type, ", "print_status, print_num, ", - "region_id, company_id, ", - "merch_id, ext_1, ext_2, ", - "ext_3)", + "whether_check, region_id, ", + "company_id, merch_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}, ", @@ -78,9 +78,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ", "#{accountMerchantNum,jdbcType=VARCHAR}, #{productType,jdbcType=INTEGER}, ", "#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ", - "#{regionId,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", - "#{merchId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{whetherCheck,jdbcType=BIT}, #{regionId,jdbcType=VARCHAR}, ", + "#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighOrder record); @@ -128,6 +128,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), + @Result(column="whether_check", property="whetherCheck", jdbcType=JdbcType.BIT), @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @@ -145,7 +146,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_no, refund_time, ", "refund_price, refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ", "profit_sharing_ratio, account_merchant_num, product_type, print_status, print_num, ", - "region_id, company_id, merch_id, ext_1, ext_2, ext_3", + "whether_check, region_id, company_id, merch_id, ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -187,6 +188,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), + @Result(column="whether_check", property="whetherCheck", jdbcType=JdbcType.BIT), @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @@ -243,6 +245,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "product_type = #{productType,jdbcType=INTEGER},", "print_status = #{printStatus,jdbcType=BIT},", "print_num = #{printNum,jdbcType=INTEGER},", + "whether_check = #{whetherCheck,jdbcType=BIT},", "region_id = #{regionId,jdbcType=VARCHAR},", "company_id = #{companyId,jdbcType=BIGINT},", "merch_id = #{merchId,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 888875df..e9cf1ff1 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -172,6 +172,10 @@ public class HighOrderSqlProvider { sql.VALUES("print_num", "#{printNum,jdbcType=INTEGER}"); } + if (record.getWhetherCheck() != null) { + sql.VALUES("whether_check", "#{whetherCheck,jdbcType=BIT}"); + } + if (record.getRegionId() != null) { sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); } @@ -242,6 +246,7 @@ public class HighOrderSqlProvider { sql.SELECT("product_type"); sql.SELECT("print_status"); sql.SELECT("print_num"); + sql.SELECT("whether_check"); sql.SELECT("region_id"); sql.SELECT("company_id"); sql.SELECT("merch_id"); @@ -413,6 +418,10 @@ public class HighOrderSqlProvider { sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); } + if (record.getWhetherCheck() != null) { + sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}"); + } + if (record.getRegionId() != null) { sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); } @@ -482,6 +491,7 @@ public class HighOrderSqlProvider { sql.SET("product_type = #{record.productType,jdbcType=INTEGER}"); sql.SET("print_status = #{record.printStatus,jdbcType=BIT}"); sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); + sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}"); sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); @@ -642,6 +652,10 @@ public class HighOrderSqlProvider { sql.SET("print_num = #{printNum,jdbcType=INTEGER}"); } + if (record.getWhetherCheck() != null) { + sql.SET("whether_check = #{whetherCheck,jdbcType=BIT}"); + } + if (record.getRegionId() != null) { sql.SET("region_id = #{regionId,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 cc4b74a1..3c5d18da 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 @@ -200,6 +199,11 @@ public class HighOrder implements Serializable { */ private Integer printNum; + /** + * 是否查看 + */ + private Boolean whetherCheck; + /** * 区域编码 */ @@ -218,37 +222,6 @@ public class HighOrder implements Serializable { 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() { @@ -547,6 +520,14 @@ public class HighOrder implements Serializable { this.printNum = printNum; } + public Boolean getWhetherCheck() { + return whetherCheck; + } + + public void setWhetherCheck(Boolean whetherCheck) { + this.whetherCheck = whetherCheck; + } + public String getRegionId() { return regionId; } @@ -644,6 +625,7 @@ public class HighOrder implements Serializable { && (this.getProductType() == null ? other.getProductType() == null : this.getProductType().equals(other.getProductType())) && (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus())) && (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum())) + && (this.getWhetherCheck() == null ? other.getWhetherCheck() == null : this.getWhetherCheck().equals(other.getWhetherCheck())) && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId())) @@ -693,6 +675,7 @@ public class HighOrder implements Serializable { result = prime * result + ((getProductType() == null) ? 0 : getProductType().hashCode()); result = prime * result + ((getPrintStatus() == null) ? 0 : getPrintStatus().hashCode()); result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode()); + result = prime * result + ((getWhetherCheck() == null) ? 0 : getWhetherCheck().hashCode()); result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode()); @@ -745,6 +728,7 @@ public class HighOrder implements Serializable { sb.append(", productType=").append(productType); sb.append(", printStatus=").append(printStatus); sb.append(", printNum=").append(printNum); + sb.append(", whetherCheck=").append(whetherCheck); sb.append(", regionId=").append(regionId); sb.append(", companyId=").append(companyId); sb.append(", merchId=").append(merchId); @@ -755,4 +739,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 0007c5b6..52baeaf0 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -2466,6 +2466,66 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andWhetherCheckIsNull() { + addCriterion("whether_check is null"); + return (Criteria) this; + } + + public Criteria andWhetherCheckIsNotNull() { + addCriterion("whether_check is not null"); + return (Criteria) this; + } + + public Criteria andWhetherCheckEqualTo(Boolean value) { + addCriterion("whether_check =", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckNotEqualTo(Boolean value) { + addCriterion("whether_check <>", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckGreaterThan(Boolean value) { + addCriterion("whether_check >", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckGreaterThanOrEqualTo(Boolean value) { + addCriterion("whether_check >=", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckLessThan(Boolean value) { + addCriterion("whether_check <", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckLessThanOrEqualTo(Boolean value) { + addCriterion("whether_check <=", value, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckIn(List values) { + addCriterion("whether_check in", values, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckNotIn(List values) { + addCriterion("whether_check not in", values, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckBetween(Boolean value1, Boolean value2) { + addCriterion("whether_check between", value1, value2, "whetherCheck"); + return (Criteria) this; + } + + public Criteria andWhetherCheckNotBetween(Boolean value1, Boolean value2) { + addCriterion("whether_check not between", value1, value2, "whetherCheck"); + return (Criteria) this; + } + public Criteria andRegionIdIsNull() { addCriterion("region_id is null"); return (Criteria) this;