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 0c936def..e0a710d3 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -58,9 +58,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "profit_sharing_ratio, account_merchant_num, ", "product_type, print_status, ", "print_num, whether_check, ", - "region_id, company_id, ", - "merch_id, ext_1, ext_2, ", - "ext_3)", + "is_rebate, 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}, ", @@ -80,9 +80,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ", "#{productType,jdbcType=INTEGER}, #{printStatus,jdbcType=BIT}, ", "#{printNum,jdbcType=INTEGER}, #{whetherCheck,jdbcType=BIT}, ", - "#{regionId,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", - "#{merchId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{isRebate,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); @@ -132,6 +132,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @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="is_rebate", property="isRebate", 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), @@ -149,8 +150,8 @@ public interface HighOrderMapper extends HighOrderMapperExt { "total_price, create_time, 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, whether_check, region_id, company_id, ", - "merch_id, ext_1, ext_2, ext_3", + "product_type, print_status, print_num, whether_check, is_rebate, region_id, ", + "company_id, merch_id, ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -194,6 +195,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @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="is_rebate", property="isRebate", 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), @@ -252,6 +254,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "print_status = #{printStatus,jdbcType=BIT},", "print_num = #{printNum,jdbcType=INTEGER},", "whether_check = #{whetherCheck,jdbcType=BIT},", + "is_rebate = #{isRebate,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 c45da981..5b5733b7 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -180,6 +180,10 @@ public class HighOrderSqlProvider { sql.VALUES("whether_check", "#{whetherCheck,jdbcType=BIT}"); } + if (record.getIsRebate() != null) { + sql.VALUES("is_rebate", "#{isRebate,jdbcType=BIT}"); + } + if (record.getRegionId() != null) { sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); } @@ -252,6 +256,7 @@ public class HighOrderSqlProvider { sql.SELECT("print_status"); sql.SELECT("print_num"); sql.SELECT("whether_check"); + sql.SELECT("is_rebate"); sql.SELECT("region_id"); sql.SELECT("company_id"); sql.SELECT("merch_id"); @@ -431,6 +436,10 @@ public class HighOrderSqlProvider { sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}"); } + if (record.getIsRebate() != null) { + sql.SET("is_rebate = #{record.isRebate,jdbcType=BIT}"); + } + if (record.getRegionId() != null) { sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); } @@ -502,6 +511,7 @@ public class HighOrderSqlProvider { 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("is_rebate = #{record.isRebate,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}"); @@ -670,6 +680,10 @@ public class HighOrderSqlProvider { sql.SET("whether_check = #{whetherCheck,jdbcType=BIT}"); } + if (record.getIsRebate() != null) { + sql.SET("is_rebate = #{isRebate,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 d08cbfd0..198ee792 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 @@ -210,6 +209,11 @@ public class HighOrder implements Serializable { */ private Boolean whetherCheck; + /** + * 是否返利 + */ + private Boolean isRebate; + /** * 区域编码 */ @@ -228,81 +232,8 @@ public class HighOrder implements Serializable { private String ext3; - private String payPwd; - - private List highChildOrderList; - - private HighDiscount highDiscount; - - private Boolean isTyAgent; - - private String gasStaffCode; - - private String password; - - /** - * 是否自动充值积分 0 否 1 是 - */ - private Boolean buyPoints; - private static final long serialVersionUID = 1L; - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPayPwd() { - return payPwd; - } - - public void setPayPwd(String payPwd) { - this.payPwd = payPwd; - } - - 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; - } - - public String getGasStaffCode() { - return gasStaffCode; - } - - public void setGasStaffCode(String gasStaffCode) { - this.gasStaffCode = gasStaffCode; - } - - public Boolean getBuyPoints() { - return buyPoints; - } - - public void setBuyPoints(Boolean buyPoints) { - this.buyPoints = buyPoints; - } - public Long getId() { return id; } @@ -615,6 +546,14 @@ public class HighOrder implements Serializable { this.whetherCheck = whetherCheck; } + public Boolean getIsRebate() { + return isRebate; + } + + public void setIsRebate(Boolean isRebate) { + this.isRebate = isRebate; + } + public String getRegionId() { return regionId; } @@ -714,6 +653,7 @@ public class HighOrder implements Serializable { && (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.getIsRebate() == null ? other.getIsRebate() == null : this.getIsRebate().equals(other.getIsRebate())) && (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())) @@ -765,6 +705,7 @@ public class HighOrder implements Serializable { 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 + ((getIsRebate() == null) ? 0 : getIsRebate().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()); @@ -819,6 +760,7 @@ public class HighOrder implements Serializable { sb.append(", printStatus=").append(printStatus); sb.append(", printNum=").append(printNum); sb.append(", whetherCheck=").append(whetherCheck); + sb.append(", isRebate=").append(isRebate); sb.append(", regionId=").append(regionId); sb.append(", companyId=").append(companyId); sb.append(", merchId=").append(merchId); @@ -829,4 +771,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 9ce0b527..befcf787 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -2586,6 +2586,66 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andIsRebateIsNull() { + addCriterion("is_rebate is null"); + return (Criteria) this; + } + + public Criteria andIsRebateIsNotNull() { + addCriterion("is_rebate is not null"); + return (Criteria) this; + } + + public Criteria andIsRebateEqualTo(Boolean value) { + addCriterion("is_rebate =", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateNotEqualTo(Boolean value) { + addCriterion("is_rebate <>", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateGreaterThan(Boolean value) { + addCriterion("is_rebate >", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateGreaterThanOrEqualTo(Boolean value) { + addCriterion("is_rebate >=", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateLessThan(Boolean value) { + addCriterion("is_rebate <", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateLessThanOrEqualTo(Boolean value) { + addCriterion("is_rebate <=", value, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateIn(List values) { + addCriterion("is_rebate in", values, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateNotIn(List values) { + addCriterion("is_rebate not in", values, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateBetween(Boolean value1, Boolean value2) { + addCriterion("is_rebate between", value1, value2, "isRebate"); + return (Criteria) this; + } + + public Criteria andIsRebateNotBetween(Boolean value1, Boolean value2) { + addCriterion("is_rebate not between", value1, value2, "isRebate"); + return (Criteria) this; + } + public Criteria andRegionIdIsNull() { addCriterion("region_id is null"); return (Criteria) this;