hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
dev-discount
袁野 2 years ago
parent c7e8d680b4
commit dd9bcc4cbe
4 changed files with 46 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  2. 16
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  3. 16
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  4. 48
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java

12
hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
Unescape View File

@ -58,7 +58,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"profit_sharing_ratio, account_merchant_num, ", "profit_sharing_ratio, account_merchant_num, ",
"product_type, print_status, ", "product_type, print_status, ",
"print_num, whether_check, ", "print_num, whether_check, ",
"is_rebate, region_id, ", "whether_rebate, region_id, ",
"company_id, merch_id, ", "company_id, merch_id, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ", "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
@ -80,7 +80,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ", "#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ",
"#{productType,jdbcType=INTEGER}, #{printStatus,jdbcType=BIT}, ", "#{productType,jdbcType=INTEGER}, #{printStatus,jdbcType=BIT}, ",
"#{printNum,jdbcType=INTEGER}, #{whetherCheck,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}, ", "#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,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_status", property="printStatus", jdbcType=JdbcType.BIT),
@Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER),
@Result(column="whether_check", property="whetherCheck", jdbcType=JdbcType.BIT), @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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @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, ", "total_price, create_time, pay_time, cancel_time, cancel_remarks, finish_time, ",
"remarks, refund_no, refund_time, refund_price, refund_content, refusal_refund_content, ", "remarks, refund_no, refund_time, refund_price, refund_content, refusal_refund_content, ",
"Identification_code, profit_sharing_status, profit_sharing_ratio, account_merchant_num, ", "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", "company_id, merch_id, ext_1, ext_2, ext_3",
"from high_order", "from high_order",
"where id = #{id,jdbcType=BIGINT}" "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_status", property="printStatus", jdbcType=JdbcType.BIT),
@Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER),
@Result(column="whether_check", property="whetherCheck", jdbcType=JdbcType.BIT), @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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR),
@ -254,7 +254,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"print_status = #{printStatus,jdbcType=BIT},", "print_status = #{printStatus,jdbcType=BIT},",
"print_num = #{printNum,jdbcType=INTEGER},", "print_num = #{printNum,jdbcType=INTEGER},",
"whether_check = #{whetherCheck,jdbcType=BIT},", "whether_check = #{whetherCheck,jdbcType=BIT},",
"is_rebate = #{isRebate,jdbcType=BIT},", "whether_rebate = #{whetherRebate,jdbcType=BIT},",
"region_id = #{regionId,jdbcType=VARCHAR},", "region_id = #{regionId,jdbcType=VARCHAR},",
"company_id = #{companyId,jdbcType=BIGINT},", "company_id = #{companyId,jdbcType=BIGINT},",
"merch_id = #{merchId,jdbcType=VARCHAR},", "merch_id = #{merchId,jdbcType=VARCHAR},",

16
hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
Unescape View File

@ -180,8 +180,8 @@ public class HighOrderSqlProvider {
sql.VALUES("whether_check", "#{whetherCheck,jdbcType=BIT}"); sql.VALUES("whether_check", "#{whetherCheck,jdbcType=BIT}");
} }
if (record.getIsRebate() != null) { if (record.getWhetherRebate() != null) {
sql.VALUES("is_rebate", "#{isRebate,jdbcType=BIT}"); sql.VALUES("whether_rebate", "#{whetherRebate,jdbcType=BIT}");
} }
if (record.getRegionId() != null) { if (record.getRegionId() != null) {
@ -256,7 +256,7 @@ public class HighOrderSqlProvider {
sql.SELECT("print_status"); sql.SELECT("print_status");
sql.SELECT("print_num"); sql.SELECT("print_num");
sql.SELECT("whether_check"); sql.SELECT("whether_check");
sql.SELECT("is_rebate"); sql.SELECT("whether_rebate");
sql.SELECT("region_id"); sql.SELECT("region_id");
sql.SELECT("company_id"); sql.SELECT("company_id");
sql.SELECT("merch_id"); sql.SELECT("merch_id");
@ -436,8 +436,8 @@ public class HighOrderSqlProvider {
sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}"); sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}");
} }
if (record.getIsRebate() != null) { if (record.getWhetherRebate() != null) {
sql.SET("is_rebate = #{record.isRebate,jdbcType=BIT}"); sql.SET("whether_rebate = #{record.whetherRebate,jdbcType=BIT}");
} }
if (record.getRegionId() != null) { if (record.getRegionId() != null) {
@ -511,7 +511,7 @@ public class HighOrderSqlProvider {
sql.SET("print_status = #{record.printStatus,jdbcType=BIT}"); sql.SET("print_status = #{record.printStatus,jdbcType=BIT}");
sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}");
sql.SET("whether_check = #{record.whetherCheck,jdbcType=BIT}"); 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("region_id = #{record.regionId,jdbcType=VARCHAR}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}");
@ -680,8 +680,8 @@ public class HighOrderSqlProvider {
sql.SET("whether_check = #{whetherCheck,jdbcType=BIT}"); sql.SET("whether_check = #{whetherCheck,jdbcType=BIT}");
} }
if (record.getIsRebate() != null) { if (record.getWhetherRebate() != null) {
sql.SET("is_rebate = #{isRebate,jdbcType=BIT}"); sql.SET("whether_rebate = #{whetherRebate,jdbcType=BIT}");
} }
if (record.getRegionId() != null) { if (record.getRegionId() != null) {

16
hai-service/src/main/java/com/hai/entity/HighOrder.java
Unescape View File

@ -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; this.whetherCheck = whetherCheck;
} }
public Boolean getIsRebate() { public Boolean getWhetherRebate() {
return isRebate; return whetherRebate;
} }
public void setIsRebate(Boolean isRebate) { public void setWhetherRebate(Boolean whetherRebate) {
this.isRebate = isRebate; this.whetherRebate = whetherRebate;
} }
public String getRegionId() { public String getRegionId() {
@ -653,7 +653,7 @@ public class HighOrder implements Serializable {
&& (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus())) && (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus()))
&& (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum())) && (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum()))
&& (this.getWhetherCheck() == null ? other.getWhetherCheck() == null : this.getWhetherCheck().equals(other.getWhetherCheck())) && (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.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId())) && (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 + ((getPrintStatus() == null) ? 0 : getPrintStatus().hashCode());
result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode()); result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode());
result = prime * result + ((getWhetherCheck() == null) ? 0 : getWhetherCheck().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 + ((getRegionId() == null) ? 0 : getRegionId().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().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(", printStatus=").append(printStatus);
sb.append(", printNum=").append(printNum); sb.append(", printNum=").append(printNum);
sb.append(", whetherCheck=").append(whetherCheck); sb.append(", whetherCheck=").append(whetherCheck);
sb.append(", isRebate=").append(isRebate); sb.append(", whetherRebate=").append(whetherRebate);
sb.append(", regionId=").append(regionId); sb.append(", regionId=").append(regionId);
sb.append(", companyId=").append(companyId); sb.append(", companyId=").append(companyId);
sb.append(", merchId=").append(merchId); sb.append(", merchId=").append(merchId);

48
hai-service/src/main/java/com/hai/entity/HighOrderExample.java
Unescape View File

@ -2586,63 +2586,63 @@ public class HighOrderExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateIsNull() { public Criteria andWhetherRebateIsNull() {
addCriterion("is_rebate is null"); addCriterion("whether_rebate is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateIsNotNull() { public Criteria andWhetherRebateIsNotNull() {
addCriterion("is_rebate is not null"); addCriterion("whether_rebate is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateEqualTo(Boolean value) { public Criteria andWhetherRebateEqualTo(Boolean value) {
addCriterion("is_rebate =", value, "isRebate"); addCriterion("whether_rebate =", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateNotEqualTo(Boolean value) { public Criteria andWhetherRebateNotEqualTo(Boolean value) {
addCriterion("is_rebate <>", value, "isRebate"); addCriterion("whether_rebate <>", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateGreaterThan(Boolean value) { public Criteria andWhetherRebateGreaterThan(Boolean value) {
addCriterion("is_rebate >", value, "isRebate"); addCriterion("whether_rebate >", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateGreaterThanOrEqualTo(Boolean value) { public Criteria andWhetherRebateGreaterThanOrEqualTo(Boolean value) {
addCriterion("is_rebate >=", value, "isRebate"); addCriterion("whether_rebate >=", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateLessThan(Boolean value) { public Criteria andWhetherRebateLessThan(Boolean value) {
addCriterion("is_rebate <", value, "isRebate"); addCriterion("whether_rebate <", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateLessThanOrEqualTo(Boolean value) { public Criteria andWhetherRebateLessThanOrEqualTo(Boolean value) {
addCriterion("is_rebate <=", value, "isRebate"); addCriterion("whether_rebate <=", value, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateIn(List<Boolean> values) { public Criteria andWhetherRebateIn(List<Boolean> values) {
addCriterion("is_rebate in", values, "isRebate"); addCriterion("whether_rebate in", values, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateNotIn(List<Boolean> values) { public Criteria andWhetherRebateNotIn(List<Boolean> values) {
addCriterion("is_rebate not in", values, "isRebate"); addCriterion("whether_rebate not in", values, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateBetween(Boolean value1, Boolean value2) { public Criteria andWhetherRebateBetween(Boolean value1, Boolean value2) {
addCriterion("is_rebate between", value1, value2, "isRebate"); addCriterion("whether_rebate between", value1, value2, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsRebateNotBetween(Boolean value1, Boolean value2) { public Criteria andWhetherRebateNotBetween(Boolean value1, Boolean value2) {
addCriterion("is_rebate not between", value1, value2, "isRebate"); addCriterion("whether_rebate not between", value1, value2, "whetherRebate");
return (Criteria) this; return (Criteria) this;
} }

Write Preview
Loading…
Cancel
Save