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

Merge remote-tracking branch 'origin/api-dev' into api-dev

Browse Source
袁野 2 years ago
parent dab3fa0453 59fc152281
commit bbe9c0e452
4 changed files with 210 additions and 15 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. 38
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  2. 28
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  3. 29
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  4. 130
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java

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

@ -51,12 +51,13 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"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, ",
"region_id, ext_1, ",
"refund_no, refund_time, ",
"refund_price, refund_content, ",
"refusal_refund_content, Identification_code, ",
"profit_sharing_status, profit_sharing_ratio, ",
"account_merchant_num, print_status, ",
"print_num, region_id, ",
"company_id, ext_1, ",
"ext_2, ext_3)",
"values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
"#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ",
@ -70,12 +71,13 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
"#{cancelTime,jdbcType=TIMESTAMP}, #{cancelRemarks,jdbcType=VARCHAR}, ",
"#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ",
"#{refundTime,jdbcType=TIMESTAMP}, #{refundPrice,jdbcType=DECIMAL}, ",
"#{refundContent,jdbcType=VARCHAR}, #{refusalRefundContent,jdbcType=VARCHAR}, ",
"#{identificationCode,jdbcType=BIGINT}, #{profitSharingStatus,jdbcType=BIT}, ",
"#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ",
"#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ",
"#{regionId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
"#{refundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ",
"#{refundPrice,jdbcType=DECIMAL}, #{refundContent,jdbcType=VARCHAR}, ",
"#{refusalRefundContent,jdbcType=VARCHAR}, #{identificationCode,jdbcType=BIGINT}, ",
"#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ",
"#{accountMerchantNum,jdbcType=VARCHAR}, #{printStatus,jdbcType=BIT}, ",
"#{printNum,jdbcType=INTEGER}, #{regionId,jdbcType=VARCHAR}, ",
"#{companyId,jdbcType=BIGINT}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
@ -112,6 +114,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="cancel_remarks", property="cancelRemarks", jdbcType=JdbcType.VARCHAR),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_no", property="refundNo", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
@ -123,6 +126,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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@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)
@ -134,10 +138,10 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"id, order_no, mem_discount_id, mem_discount_name, mem_id, mem_name, mem_phone, ",
"mem_card_id, mem_card_type, mem_card_no, pay_model, pay_type, pay_gold, pay_price, ",
"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, ",
"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, print_status, print_num, region_id, ",
"ext_1, ext_2, ext_3",
"company_id, ext_1, ext_2, ext_3",
"from high_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -167,6 +171,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="cancel_remarks", property="cancelRemarks", jdbcType=JdbcType.VARCHAR),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_no", property="refundNo", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
@ -178,6 +183,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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@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)
@ -219,6 +225,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"cancel_remarks = #{cancelRemarks,jdbcType=VARCHAR},",
"finish_time = #{finishTime,jdbcType=TIMESTAMP},",
"remarks = #{remarks,jdbcType=VARCHAR},",
"refund_no = #{refundNo,jdbcType=VARCHAR},",
"refund_time = #{refundTime,jdbcType=TIMESTAMP},",
"refund_price = #{refundPrice,jdbcType=DECIMAL},",
"refund_content = #{refundContent,jdbcType=VARCHAR},",
@ -230,6 +237,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"print_status = #{printStatus,jdbcType=BIT},",
"print_num = #{printNum,jdbcType=INTEGER},",
"region_id = #{regionId,jdbcType=VARCHAR},",
"company_id = #{companyId,jdbcType=BIGINT},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

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

@ -124,6 +124,10 @@ public class HighOrderSqlProvider {
sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}");
}
if (record.getRefundNo() != null) {
sql.VALUES("refund_no", "#{refundNo,jdbcType=VARCHAR}");
}
if (record.getRefundTime() != null) {
sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}");
}
@ -168,6 +172,10 @@ public class HighOrderSqlProvider {
sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
@ -214,6 +222,7 @@ public class HighOrderSqlProvider {
sql.SELECT("cancel_remarks");
sql.SELECT("finish_time");
sql.SELECT("remarks");
sql.SELECT("refund_no");
sql.SELECT("refund_time");
sql.SELECT("refund_price");
sql.SELECT("refund_content");
@ -225,6 +234,7 @@ public class HighOrderSqlProvider {
sql.SELECT("print_status");
sql.SELECT("print_num");
sql.SELECT("region_id");
sql.SELECT("company_id");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -345,6 +355,10 @@ public class HighOrderSqlProvider {
sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}");
}
if (record.getRefundNo() != null) {
sql.SET("refund_no = #{record.refundNo,jdbcType=VARCHAR}");
}
if (record.getRefundTime() != null) {
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
}
@ -389,6 +403,10 @@ public class HighOrderSqlProvider {
sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
@ -434,6 +452,7 @@ public class HighOrderSqlProvider {
sql.SET("cancel_remarks = #{record.cancelRemarks,jdbcType=VARCHAR}");
sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}");
sql.SET("refund_no = #{record.refundNo,jdbcType=VARCHAR}");
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
sql.SET("refund_content = #{record.refundContent,jdbcType=VARCHAR}");
@ -445,6 +464,7 @@ public class HighOrderSqlProvider {
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("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -554,6 +574,10 @@ public class HighOrderSqlProvider {
sql.SET("remarks = #{remarks,jdbcType=VARCHAR}");
}
if (record.getRefundNo() != null) {
sql.SET("refund_no = #{refundNo,jdbcType=VARCHAR}");
}
if (record.getRefundTime() != null) {
sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}");
}
@ -598,6 +622,10 @@ public class HighOrderSqlProvider {
sql.SET("region_id = #{regionId,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.SET("company_id = #{companyId,jdbcType=BIGINT}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}

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

@ -140,6 +140,11 @@ public class HighOrder implements Serializable {
*/
private String remarks;
/**
* 退款订单号
*/
private String refundNo;
/**
* 退款时间【退款成功时间】
*/
@ -195,6 +200,8 @@ public class HighOrder implements Serializable {
*/
private String regionId;
private Long companyId;
private String ext1;
private String ext2;
@ -433,6 +440,14 @@ public class HighOrder implements Serializable {
this.remarks = remarks;
}
public String getRefundNo() {
return refundNo;
}
public void setRefundNo(String refundNo) {
this.refundNo = refundNo;
}
public Date getRefundTime() {
return refundTime;
}
@ -521,6 +536,14 @@ public class HighOrder implements Serializable {
this.regionId = regionId;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public String getExt1() {
return ext1;
}
@ -582,6 +605,7 @@ public class HighOrder implements Serializable {
&& (this.getCancelRemarks() == null ? other.getCancelRemarks() == null : this.getCancelRemarks().equals(other.getCancelRemarks()))
&& (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
&& (this.getRefundNo() == null ? other.getRefundNo() == null : this.getRefundNo().equals(other.getRefundNo()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice()))
&& (this.getRefundContent() == null ? other.getRefundContent() == null : this.getRefundContent().equals(other.getRefundContent()))
@ -593,6 +617,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.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (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()));
@ -627,6 +652,7 @@ public class HighOrder implements Serializable {
result = prime * result + ((getCancelRemarks() == null) ? 0 : getCancelRemarks().hashCode());
result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
result = prime * result + ((getRefundNo() == null) ? 0 : getRefundNo().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode());
result = prime * result + ((getRefundContent() == null) ? 0 : getRefundContent().hashCode());
@ -638,6 +664,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 + ((getRegionId() == null) ? 0 : getRegionId().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().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());
@ -675,6 +702,7 @@ public class HighOrder implements Serializable {
sb.append(", cancelRemarks=").append(cancelRemarks);
sb.append(", finishTime=").append(finishTime);
sb.append(", remarks=").append(remarks);
sb.append(", refundNo=").append(refundNo);
sb.append(", refundTime=").append(refundTime);
sb.append(", refundPrice=").append(refundPrice);
sb.append(", refundContent=").append(refundContent);
@ -686,6 +714,7 @@ public class HighOrder implements Serializable {
sb.append(", printStatus=").append(printStatus);
sb.append(", printNum=").append(printNum);
sb.append(", regionId=").append(regionId);
sb.append(", companyId=").append(companyId);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

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

@ -1706,6 +1706,76 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andRefundNoIsNull() {
addCriterion("refund_no is null");
return (Criteria) this;
}
public Criteria andRefundNoIsNotNull() {
addCriterion("refund_no is not null");
return (Criteria) this;
}
public Criteria andRefundNoEqualTo(String value) {
addCriterion("refund_no =", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoNotEqualTo(String value) {
addCriterion("refund_no <>", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoGreaterThan(String value) {
addCriterion("refund_no >", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoGreaterThanOrEqualTo(String value) {
addCriterion("refund_no >=", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoLessThan(String value) {
addCriterion("refund_no <", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoLessThanOrEqualTo(String value) {
addCriterion("refund_no <=", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoLike(String value) {
addCriterion("refund_no like", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoNotLike(String value) {
addCriterion("refund_no not like", value, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoIn(List<String> values) {
addCriterion("refund_no in", values, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoNotIn(List<String> values) {
addCriterion("refund_no not in", values, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoBetween(String value1, String value2) {
addCriterion("refund_no between", value1, value2, "refundNo");
return (Criteria) this;
}
public Criteria andRefundNoNotBetween(String value1, String value2) {
addCriterion("refund_no not between", value1, value2, "refundNo");
return (Criteria) this;
}
public Criteria andRefundTimeIsNull() {
addCriterion("refund_time is null");
return (Criteria) this;
@ -2406,6 +2476,66 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Long value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Long value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Long value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Long value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Long> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Long> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Long value1, Long value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save