diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java index 9825cb7b..65bf7d69 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java @@ -47,7 +47,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { "goods_id, goods_name, ", "pre_time, pre_user_id, ", "pre_user_name, pre_user_phone, ", - "pre_user_remark, stauts, ", + "pre_user_remark, `status`, ", "status_fail_desc, status_cancel_desc, ", "reach_time, reach_address, ", "op_user_id, op_user_name, ", @@ -62,7 +62,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ", "#{preTime,jdbcType=TIMESTAMP}, #{preUserId,jdbcType=BIGINT}, ", "#{preUserName,jdbcType=VARCHAR}, #{preUserPhone,jdbcType=VARCHAR}, ", - "#{preUserRemark,jdbcType=VARCHAR}, #{stauts,jdbcType=INTEGER}, ", + "#{preUserRemark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{statusFailDesc,jdbcType=VARCHAR}, #{statusCancelDesc,jdbcType=VARCHAR}, ", "#{reachTime,jdbcType=TIMESTAMP}, #{reachAddress,jdbcType=VARCHAR}, ", "#{opUserId,jdbcType=BIGINT}, #{opUserName,jdbcType=VARCHAR}, ", @@ -97,7 +97,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { @Result(column="pre_user_name", property="preUserName", jdbcType=JdbcType.VARCHAR), @Result(column="pre_user_phone", property="preUserPhone", jdbcType=JdbcType.VARCHAR), @Result(column="pre_user_remark", property="preUserRemark", jdbcType=JdbcType.VARCHAR), - @Result(column="stauts", property="stauts", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="status_fail_desc", property="statusFailDesc", jdbcType=JdbcType.VARCHAR), @Result(column="status_cancel_desc", property="statusCancelDesc", jdbcType=JdbcType.VARCHAR), @Result(column="reach_time", property="reachTime", jdbcType=JdbcType.TIMESTAMP), @@ -118,7 +118,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { "select", "id, company_id, merchant_id, merchant_store_id, agent_id, pre_order_no, order_id, ", "order_no, child_order_id, pay_real_price, goods_type, goods_id, goods_name, ", - "pre_time, pre_user_id, pre_user_name, pre_user_phone, pre_user_remark, stauts, ", + "pre_time, pre_user_id, pre_user_name, pre_user_phone, pre_user_remark, `status`, ", "status_fail_desc, status_cancel_desc, reach_time, reach_address, op_user_id, ", "op_user_name, create_time, update_time, ext_1, ext_2, ext_3, ext_4, ext_5", "from high_order_pre", @@ -143,7 +143,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { @Result(column="pre_user_name", property="preUserName", jdbcType=JdbcType.VARCHAR), @Result(column="pre_user_phone", property="preUserPhone", jdbcType=JdbcType.VARCHAR), @Result(column="pre_user_remark", property="preUserRemark", jdbcType=JdbcType.VARCHAR), - @Result(column="stauts", property="stauts", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="status_fail_desc", property="statusFailDesc", jdbcType=JdbcType.VARCHAR), @Result(column="status_cancel_desc", property="statusCancelDesc", jdbcType=JdbcType.VARCHAR), @Result(column="reach_time", property="reachTime", jdbcType=JdbcType.TIMESTAMP), @@ -188,7 +188,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt { "pre_user_name = #{preUserName,jdbcType=VARCHAR},", "pre_user_phone = #{preUserPhone,jdbcType=VARCHAR},", "pre_user_remark = #{preUserRemark,jdbcType=VARCHAR},", - "stauts = #{stauts,jdbcType=INTEGER},", + "`status` = #{status,jdbcType=INTEGER},", "status_fail_desc = #{statusFailDesc,jdbcType=VARCHAR},", "status_cancel_desc = #{statusCancelDesc,jdbcType=VARCHAR},", "reach_time = #{reachTime,jdbcType=TIMESTAMP},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java index f0010b6e..0252972a 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java @@ -96,8 +96,8 @@ public class HighOrderPreSqlProvider { sql.VALUES("pre_user_remark", "#{preUserRemark,jdbcType=VARCHAR}"); } - if (record.getStauts() != null) { - sql.VALUES("stauts", "#{stauts,jdbcType=INTEGER}"); + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } if (record.getStatusFailDesc() != null) { @@ -179,7 +179,7 @@ public class HighOrderPreSqlProvider { sql.SELECT("pre_user_name"); sql.SELECT("pre_user_phone"); sql.SELECT("pre_user_remark"); - sql.SELECT("stauts"); + sql.SELECT("`status`"); sql.SELECT("status_fail_desc"); sql.SELECT("status_cancel_desc"); sql.SELECT("reach_time"); @@ -282,8 +282,8 @@ public class HighOrderPreSqlProvider { sql.SET("pre_user_remark = #{record.preUserRemark,jdbcType=VARCHAR}"); } - if (record.getStauts() != null) { - sql.SET("stauts = #{record.stauts,jdbcType=INTEGER}"); + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } if (record.getStatusFailDesc() != null) { @@ -364,7 +364,7 @@ public class HighOrderPreSqlProvider { sql.SET("pre_user_name = #{record.preUserName,jdbcType=VARCHAR}"); sql.SET("pre_user_phone = #{record.preUserPhone,jdbcType=VARCHAR}"); sql.SET("pre_user_remark = #{record.preUserRemark,jdbcType=VARCHAR}"); - sql.SET("stauts = #{record.stauts,jdbcType=INTEGER}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("status_fail_desc = #{record.statusFailDesc,jdbcType=VARCHAR}"); sql.SET("status_cancel_desc = #{record.statusCancelDesc,jdbcType=VARCHAR}"); sql.SET("reach_time = #{record.reachTime,jdbcType=TIMESTAMP}"); @@ -456,8 +456,8 @@ public class HighOrderPreSqlProvider { sql.SET("pre_user_remark = #{preUserRemark,jdbcType=VARCHAR}"); } - if (record.getStauts() != null) { - sql.SET("stauts = #{stauts,jdbcType=INTEGER}"); + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); } if (record.getStatusFailDesc() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderPre.java b/hai-service/src/main/java/com/hai/entity/HighOrderPre.java index 31295171..d0c87fc5 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderPre.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderPre.java @@ -107,7 +107,7 @@ public class HighOrderPre implements Serializable { /** * 状态 1.预约中 2. 预约成功 3.预约完成 4.预约失败 5.预约取消 */ - private Integer stauts; + private Integer status; /** * 预约失败说明 @@ -305,12 +305,12 @@ public class HighOrderPre implements Serializable { this.preUserRemark = preUserRemark; } - public Integer getStauts() { - return stauts; + public Integer getStatus() { + return status; } - public void setStauts(Integer stauts) { - this.stauts = stauts; + public void setStatus(Integer status) { + this.status = status; } public String getStatusFailDesc() { @@ -447,7 +447,7 @@ public class HighOrderPre implements Serializable { && (this.getPreUserName() == null ? other.getPreUserName() == null : this.getPreUserName().equals(other.getPreUserName())) && (this.getPreUserPhone() == null ? other.getPreUserPhone() == null : this.getPreUserPhone().equals(other.getPreUserPhone())) && (this.getPreUserRemark() == null ? other.getPreUserRemark() == null : this.getPreUserRemark().equals(other.getPreUserRemark())) - && (this.getStauts() == null ? other.getStauts() == null : this.getStauts().equals(other.getStauts())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getStatusFailDesc() == null ? other.getStatusFailDesc() == null : this.getStatusFailDesc().equals(other.getStatusFailDesc())) && (this.getStatusCancelDesc() == null ? other.getStatusCancelDesc() == null : this.getStatusCancelDesc().equals(other.getStatusCancelDesc())) && (this.getReachTime() == null ? other.getReachTime() == null : this.getReachTime().equals(other.getReachTime())) @@ -485,7 +485,7 @@ public class HighOrderPre implements Serializable { result = prime * result + ((getPreUserName() == null) ? 0 : getPreUserName().hashCode()); result = prime * result + ((getPreUserPhone() == null) ? 0 : getPreUserPhone().hashCode()); result = prime * result + ((getPreUserRemark() == null) ? 0 : getPreUserRemark().hashCode()); - result = prime * result + ((getStauts() == null) ? 0 : getStauts().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getStatusFailDesc() == null) ? 0 : getStatusFailDesc().hashCode()); result = prime * result + ((getStatusCancelDesc() == null) ? 0 : getStatusCancelDesc().hashCode()); result = prime * result + ((getReachTime() == null) ? 0 : getReachTime().hashCode()); @@ -526,7 +526,7 @@ public class HighOrderPre implements Serializable { sb.append(", preUserName=").append(preUserName); sb.append(", preUserPhone=").append(preUserPhone); sb.append(", preUserRemark=").append(preUserRemark); - sb.append(", stauts=").append(stauts); + sb.append(", status=").append(status); sb.append(", statusFailDesc=").append(statusFailDesc); sb.append(", statusCancelDesc=").append(statusCancelDesc); sb.append(", reachTime=").append(reachTime); diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java index 29d3a826..916a8b89 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java @@ -1266,63 +1266,63 @@ public class HighOrderPreExample { return (Criteria) this; } - public Criteria andStautsIsNull() { - addCriterion("stauts is null"); + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); return (Criteria) this; } - public Criteria andStautsIsNotNull() { - addCriterion("stauts is not null"); + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); return (Criteria) this; } - public Criteria andStautsEqualTo(Integer value) { - addCriterion("stauts =", value, "stauts"); + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); return (Criteria) this; } - public Criteria andStautsNotEqualTo(Integer value) { - addCriterion("stauts <>", value, "stauts"); + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); return (Criteria) this; } - public Criteria andStautsGreaterThan(Integer value) { - addCriterion("stauts >", value, "stauts"); + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); return (Criteria) this; } - public Criteria andStautsGreaterThanOrEqualTo(Integer value) { - addCriterion("stauts >=", value, "stauts"); + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); return (Criteria) this; } - public Criteria andStautsLessThan(Integer value) { - addCriterion("stauts <", value, "stauts"); + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); return (Criteria) this; } - public Criteria andStautsLessThanOrEqualTo(Integer value) { - addCriterion("stauts <=", value, "stauts"); + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); return (Criteria) this; } - public Criteria andStautsIn(List values) { - addCriterion("stauts in", values, "stauts"); + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); return (Criteria) this; } - public Criteria andStautsNotIn(List values) { - addCriterion("stauts not in", values, "stauts"); + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); return (Criteria) this; } - public Criteria andStautsBetween(Integer value1, Integer value2) { - addCriterion("stauts between", value1, value2, "stauts"); + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); return (Criteria) this; } - public Criteria andStautsNotBetween(Integer value1, Integer value2) { - addCriterion("stauts not between", value1, value2, "stauts"); + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); return (Criteria) this; }