From dd9bcc4cbe274b835e8d849ddeb87b98276a9b23 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Wed, 10 Aug 2022 16:04:15 +0800 Subject: [PATCH] 1 --- .../java/com/hai/dao/HighOrderMapper.java | 12 ++--- .../com/hai/dao/HighOrderSqlProvider.java | 16 +++---- .../main/java/com/hai/entity/HighOrder.java | 16 +++---- .../java/com/hai/entity/HighOrderExample.java | 48 +++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) 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 e0a710d3..15f27d63 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -58,7 +58,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "profit_sharing_ratio, account_merchant_num, ", "product_type, print_status, ", "print_num, whether_check, ", - "is_rebate, region_id, ", + "whether_rebate, region_id, ", "company_id, merch_id, ", "ext_1, ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ", @@ -80,7 +80,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ", "#{productType,jdbcType=INTEGER}, #{printStatus,jdbcType=BIT}, ", "#{printNum,jdbcType=INTEGER}, #{whetherCheck,jdbcType=BIT}, ", - "#{isRebate,jdbcType=BIT}, #{regionId,jdbcType=VARCHAR}, ", + "#{whetherRebate,jdbcType=BIT}, #{regionId,jdbcType=VARCHAR}, ", "#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @@ -132,7 +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="whether_rebate", property="whetherRebate", 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), @@ -150,7 +150,7 @@ 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, is_rebate, region_id, ", + "product_type, print_status, print_num, whether_check, whether_rebate, region_id, ", "company_id, merch_id, ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" @@ -195,7 +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="whether_rebate", property="whetherRebate", 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), @@ -254,7 +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},", + "whether_rebate = #{whetherRebate,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 5b5733b7..363aba79 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -180,8 +180,8 @@ public class HighOrderSqlProvider { sql.VALUES("whether_check", "#{whetherCheck,jdbcType=BIT}"); } - if (record.getIsRebate() != null) { - sql.VALUES("is_rebate", "#{isRebate,jdbcType=BIT}"); + if (record.getWhetherRebate() != null) { + sql.VALUES("whether_rebate", "#{whetherRebate,jdbcType=BIT}"); } if (record.getRegionId() != null) { @@ -256,7 +256,7 @@ public class HighOrderSqlProvider { sql.SELECT("print_status"); sql.SELECT("print_num"); sql.SELECT("whether_check"); - sql.SELECT("is_rebate"); + sql.SELECT("whether_rebate"); sql.SELECT("region_id"); sql.SELECT("company_id"); sql.SELECT("merch_id"); @@ -436,8 +436,8 @@ 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.getWhetherRebate() != null) { + sql.SET("whether_rebate = #{record.whetherRebate,jdbcType=BIT}"); } if (record.getRegionId() != null) { @@ -511,7 +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("whether_rebate = #{record.whetherRebate,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}"); @@ -680,8 +680,8 @@ public class HighOrderSqlProvider { sql.SET("whether_check = #{whetherCheck,jdbcType=BIT}"); } - if (record.getIsRebate() != null) { - sql.SET("is_rebate = #{isRebate,jdbcType=BIT}"); + if (record.getWhetherRebate() != null) { + sql.SET("whether_rebate = #{whetherRebate,jdbcType=BIT}"); } if (record.getRegionId() != null) { 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 198ee792..47388ea4 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -212,7 +212,7 @@ public class HighOrder implements Serializable { /** * 是否返利 */ - private Boolean isRebate; + private Boolean whetherRebate; /** * 区域编码 @@ -546,12 +546,12 @@ public class HighOrder implements Serializable { this.whetherCheck = whetherCheck; } - public Boolean getIsRebate() { - return isRebate; + public Boolean getWhetherRebate() { + return whetherRebate; } - public void setIsRebate(Boolean isRebate) { - this.isRebate = isRebate; + public void setWhetherRebate(Boolean whetherRebate) { + this.whetherRebate = whetherRebate; } public String getRegionId() { @@ -653,7 +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.getWhetherRebate() == null ? other.getWhetherRebate() == null : this.getWhetherRebate().equals(other.getWhetherRebate())) && (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())) @@ -705,7 +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 + ((getWhetherRebate() == null) ? 0 : getWhetherRebate().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()); @@ -760,7 +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(", whetherRebate=").append(whetherRebate); sb.append(", regionId=").append(regionId); sb.append(", companyId=").append(companyId); sb.append(", merchId=").append(merchId); 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 befcf787..6c33a2c6 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -2586,63 +2586,63 @@ public class HighOrderExample { return (Criteria) this; } - public Criteria andIsRebateIsNull() { - addCriterion("is_rebate is null"); + public Criteria andWhetherRebateIsNull() { + addCriterion("whether_rebate is null"); return (Criteria) this; } - public Criteria andIsRebateIsNotNull() { - addCriterion("is_rebate is not null"); + public Criteria andWhetherRebateIsNotNull() { + addCriterion("whether_rebate is not null"); return (Criteria) this; } - public Criteria andIsRebateEqualTo(Boolean value) { - addCriterion("is_rebate =", value, "isRebate"); + public Criteria andWhetherRebateEqualTo(Boolean value) { + addCriterion("whether_rebate =", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateNotEqualTo(Boolean value) { - addCriterion("is_rebate <>", value, "isRebate"); + public Criteria andWhetherRebateNotEqualTo(Boolean value) { + addCriterion("whether_rebate <>", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateGreaterThan(Boolean value) { - addCriterion("is_rebate >", value, "isRebate"); + public Criteria andWhetherRebateGreaterThan(Boolean value) { + addCriterion("whether_rebate >", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_rebate >=", value, "isRebate"); + public Criteria andWhetherRebateGreaterThanOrEqualTo(Boolean value) { + addCriterion("whether_rebate >=", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateLessThan(Boolean value) { - addCriterion("is_rebate <", value, "isRebate"); + public Criteria andWhetherRebateLessThan(Boolean value) { + addCriterion("whether_rebate <", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateLessThanOrEqualTo(Boolean value) { - addCriterion("is_rebate <=", value, "isRebate"); + public Criteria andWhetherRebateLessThanOrEqualTo(Boolean value) { + addCriterion("whether_rebate <=", value, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateIn(List values) { - addCriterion("is_rebate in", values, "isRebate"); + public Criteria andWhetherRebateIn(List values) { + addCriterion("whether_rebate in", values, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateNotIn(List values) { - addCriterion("is_rebate not in", values, "isRebate"); + public Criteria andWhetherRebateNotIn(List values) { + addCriterion("whether_rebate not in", values, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateBetween(Boolean value1, Boolean value2) { - addCriterion("is_rebate between", value1, value2, "isRebate"); + public Criteria andWhetherRebateBetween(Boolean value1, Boolean value2) { + addCriterion("whether_rebate between", value1, value2, "whetherRebate"); return (Criteria) this; } - public Criteria andIsRebateNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_rebate not between", value1, value2, "isRebate"); + public Criteria andWhetherRebateNotBetween(Boolean value1, Boolean value2) { + addCriterion("whether_rebate not between", value1, value2, "whetherRebate"); return (Criteria) this; }