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

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

Browse Source
new-dev
袁野 2 years ago
parent d96457f424 16de11680d
commit 92ed037465
4 changed files with 99 additions and 5 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/ApiOrderMapper.java
  2. 14
      hai-service/src/main/java/com/hai/dao/ApiOrderSqlProvider.java
  3. 17
      hai-service/src/main/java/com/hai/entity/ApiOrder.java
  4. 60
      hai-service/src/main/java/com/hai/entity/ApiOrderExample.java

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

@ -46,8 +46,8 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
"order_price, create_time, ",
"update_time, notify_url, ",
"content, remark, ",
"`status`, ext_1, ext_2, ",
"ext_3)",
"`status`, whether_exception, ",
"ext_1, ext_2, ext_3)",
"values (#{title,jdbcType=VARCHAR}, #{productType,jdbcType=INTEGER}, ",
"#{orderNo,jdbcType=VARCHAR}, #{mchOrderNo,jdbcType=VARCHAR}, ",
"#{mchName,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, ",
@ -55,8 +55,8 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
"#{orderPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{notifyUrl,jdbcType=VARCHAR}, ",
"#{content,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
"#{status,jdbcType=INTEGER}, #{whetherException,jdbcType=BIT}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(ApiOrder record);
@ -83,6 +83,7 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
@Result(column="content", property="content", jdbcType=JdbcType.VARCHAR),
@Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="whether_exception", property="whetherException", jdbcType=JdbcType.BIT),
@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)
@ -93,7 +94,7 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
"select",
"id, title, product_type, order_no, mch_order_no, mch_name, mch_id, cost_price, ",
"face_price, order_price, create_time, update_time, notify_url, content, remark, ",
"`status`, ext_1, ext_2, ext_3",
"`status`, whether_exception, ext_1, ext_2, ext_3",
"from api_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -114,6 +115,7 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
@Result(column="content", property="content", jdbcType=JdbcType.VARCHAR),
@Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="whether_exception", property="whetherException", jdbcType=JdbcType.BIT),
@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)
@ -146,6 +148,7 @@ public interface ApiOrderMapper extends ApiOrderMapperExt {
"content = #{content,jdbcType=VARCHAR},",
"remark = #{remark,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"whether_exception = #{whetherException,jdbcType=BIT},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

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

@ -88,6 +88,10 @@ public class ApiOrderSqlProvider {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getWhetherException() != null) {
sql.VALUES("whether_exception", "#{whetherException,jdbcType=BIT}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
@ -125,6 +129,7 @@ public class ApiOrderSqlProvider {
sql.SELECT("content");
sql.SELECT("remark");
sql.SELECT("`status`");
sql.SELECT("whether_exception");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -209,6 +214,10 @@ public class ApiOrderSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getWhetherException() != null) {
sql.SET("whether_exception = #{record.whetherException,jdbcType=BIT}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
@ -245,6 +254,7 @@ public class ApiOrderSqlProvider {
sql.SET("content = #{record.content,jdbcType=VARCHAR}");
sql.SET("remark = #{record.remark,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("whether_exception = #{record.whetherException,jdbcType=BIT}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -318,6 +328,10 @@ public class ApiOrderSqlProvider {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getWhetherException() != null) {
sql.SET("whether_exception = #{whetherException,jdbcType=BIT}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}

17
hai-service/src/main/java/com/hai/entity/ApiOrder.java
Unescape View File

@ -94,6 +94,12 @@ public class ApiOrder implements Serializable {
*/
private Integer status;
/**
* 是否异常
*/
private Boolean whetherException;
/**
* ext_1
*/
@ -239,6 +245,14 @@ public class ApiOrder implements Serializable {
this.status = status;
}
public Boolean getWhetherException() {
return whetherException;
}
public void setWhetherException(Boolean whetherException) {
this.whetherException = whetherException;
}
public String getExt1() {
return ext1;
}
@ -291,6 +305,7 @@ public class ApiOrder implements Serializable {
&& (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()))
&& (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getWhetherException() == null ? other.getWhetherException() == null : this.getWhetherException().equals(other.getWhetherException()))
&& (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()));
@ -316,6 +331,7 @@ public class ApiOrder implements Serializable {
result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getWhetherException() == null) ? 0 : getWhetherException().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());
@ -344,6 +360,7 @@ public class ApiOrder implements Serializable {
sb.append(", content=").append(content);
sb.append(", remark=").append(remark);
sb.append(", status=").append(status);
sb.append(", whetherException=").append(whetherException);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

60
hai-service/src/main/java/com/hai/entity/ApiOrderExample.java
Unescape View File

@ -1166,6 +1166,66 @@ public class ApiOrderExample {
return (Criteria) this;
}
public Criteria andWhetherExceptionIsNull() {
addCriterion("whether_exception is null");
return (Criteria) this;
}
public Criteria andWhetherExceptionIsNotNull() {
addCriterion("whether_exception is not null");
return (Criteria) this;
}
public Criteria andWhetherExceptionEqualTo(Boolean value) {
addCriterion("whether_exception =", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionNotEqualTo(Boolean value) {
addCriterion("whether_exception <>", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionGreaterThan(Boolean value) {
addCriterion("whether_exception >", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionGreaterThanOrEqualTo(Boolean value) {
addCriterion("whether_exception >=", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionLessThan(Boolean value) {
addCriterion("whether_exception <", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionLessThanOrEqualTo(Boolean value) {
addCriterion("whether_exception <=", value, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionIn(List<Boolean> values) {
addCriterion("whether_exception in", values, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionNotIn(List<Boolean> values) {
addCriterion("whether_exception not in", values, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionBetween(Boolean value1, Boolean value2) {
addCriterion("whether_exception between", value1, value2, "whetherException");
return (Criteria) this;
}
public Criteria andWhetherExceptionNotBetween(Boolean value1, Boolean value2) {
addCriterion("whether_exception not between", value1, value2, "whetherException");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save