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 bbe9c0e452 37f8c49407
commit ac617dd66e
4 changed files with 109 additions and 37 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. 13
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  2. 14
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  3. 47
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  4. 70
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java

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

@ -57,8 +57,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"profit_sharing_status, profit_sharing_ratio, ",
"account_merchant_num, print_status, ",
"print_num, region_id, ",
"company_id, ext_1, ",
"ext_2, ext_3)",
"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}, ",
@ -77,8 +77,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"#{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})"
"#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighOrder record);
@ -127,6 +127,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@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="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR),
@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)
@ -141,7 +142,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, print_status, print_num, region_id, ",
"company_id, ext_1, ext_2, ext_3",
"company_id, merch_id, ext_1, ext_2, ext_3",
"from high_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -184,6 +185,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@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="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR),
@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)
@ -238,6 +240,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"print_num = #{printNum,jdbcType=INTEGER},",
"region_id = #{regionId,jdbcType=VARCHAR},",
"company_id = #{companyId,jdbcType=BIGINT},",
"merch_id = #{merchId,jdbcType=VARCHAR},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

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

@ -176,6 +176,10 @@ public class HighOrderSqlProvider {
sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}");
}
if (record.getMerchId() != null) {
sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
@ -235,6 +239,7 @@ public class HighOrderSqlProvider {
sql.SELECT("print_num");
sql.SELECT("region_id");
sql.SELECT("company_id");
sql.SELECT("merch_id");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -407,6 +412,10 @@ public class HighOrderSqlProvider {
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
}
if (record.getMerchId() != null) {
sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
@ -465,6 +474,7 @@ public class HighOrderSqlProvider {
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("merch_id = #{record.merchId,jdbcType=VARCHAR}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -626,6 +636,10 @@ public class HighOrderSqlProvider {
sql.SET("company_id = #{companyId,jdbcType=BIGINT}");
}
if (record.getMerchId() != null) {
sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}

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

@ -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
@ -202,42 +201,17 @@ public class HighOrder implements Serializable {
private Long companyId;
/**
* 商户号
*/
private String merchId;
private String ext1;
private String ext2;
private String ext3;
private List<HighChildOrder> highChildOrderList;
private HighDiscount highDiscount;
private Boolean isTyAgent;
public List<HighChildOrder> getHighChildOrderList() {
return highChildOrderList;
}
public void setHighChildOrderList(List<HighChildOrder> 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() {
@ -544,6 +518,14 @@ public class HighOrder implements Serializable {
this.companyId = companyId;
}
public String getMerchId() {
return merchId;
}
public void setMerchId(String merchId) {
this.merchId = merchId;
}
public String getExt1() {
return ext1;
}
@ -618,6 +600,7 @@ public class HighOrder implements Serializable {
&& (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.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId()))
&& (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()));
@ -665,6 +648,7 @@ public class HighOrder implements Serializable {
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 + ((getMerchId() == null) ? 0 : getMerchId().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());
@ -715,6 +699,7 @@ public class HighOrder implements Serializable {
sb.append(", printNum=").append(printNum);
sb.append(", regionId=").append(regionId);
sb.append(", companyId=").append(companyId);
sb.append(", merchId=").append(merchId);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

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

@ -2536,6 +2536,76 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andMerchIdIsNull() {
addCriterion("merch_id is null");
return (Criteria) this;
}
public Criteria andMerchIdIsNotNull() {
addCriterion("merch_id is not null");
return (Criteria) this;
}
public Criteria andMerchIdEqualTo(String value) {
addCriterion("merch_id =", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotEqualTo(String value) {
addCriterion("merch_id <>", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdGreaterThan(String value) {
addCriterion("merch_id >", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdGreaterThanOrEqualTo(String value) {
addCriterion("merch_id >=", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLessThan(String value) {
addCriterion("merch_id <", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLessThanOrEqualTo(String value) {
addCriterion("merch_id <=", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLike(String value) {
addCriterion("merch_id like", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotLike(String value) {
addCriterion("merch_id not like", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdIn(List<String> values) {
addCriterion("merch_id in", values, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotIn(List<String> values) {
addCriterion("merch_id not in", values, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdBetween(String value1, String value2) {
addCriterion("merch_id between", value1, value2, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotBetween(String value1, String value2) {
addCriterion("merch_id not between", value1, value2, "merchId");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save