diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java index 1ddf47a..3402a8d 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java @@ -40,8 +40,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { @Insert({ "insert into bs_order_meituan (order_no, child_order_no, ", - "trade_no, sqt_biz_order_id -sqt_biz_order_id, ", + "trade_no, sqt_biz_order_id, ", "mer_id, mer_name, user_id, ", "user_phone, first_business_type, ", "second_business_type, ent_id, ", @@ -62,8 +61,7 @@ sqt_biz_order_id, ", "exception_msg, ext_1, ", "ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", - "#{tradeNo,jdbcType=VARCHAR}, #{sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR}, ", + "#{tradeNo,jdbcType=VARCHAR}, #{sqtBizOrderId,jdbcType=VARCHAR}, ", "#{merId,jdbcType=BIGINT}, #{merName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", "#{userPhone,jdbcType=VARCHAR}, #{firstBusinessType,jdbcType=VARCHAR}, ", "#{secondBusinessType,jdbcType=VARCHAR}, #{entId,jdbcType=BIGINT}, ", @@ -97,9 +95,7 @@ sqtBizOrderId,jdbcType=VARCHAR}, ", @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="trade_no", property="tradeNo", jdbcType=JdbcType.VARCHAR), - @Result(column="sqt_biz_order_id -sqt_biz_order_id", property="sqtBizOrderId -sqtBizOrderId", jdbcType=JdbcType.VARCHAR), + @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR), @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @@ -144,15 +140,14 @@ sqtBizOrderId", jdbcType=JdbcType.VARCHAR), @Select({ "select", - "id, order_no, child_order_no, trade_no, sqt_biz_order_id -sqt_biz_order_id, mer_id, ", - "mer_name, user_id, user_phone, first_business_type, second_business_type, ent_id, ", - "img, goods_name, trace_id, goods_count, total_price, total_deduction_price, ", - "coupon_discount_price, integral_discount_price, platform_code, pay_real_price, ", - "ent_pay_amount, business_discount_pay_amount, service_fee_amount, pay_channel, ", - "pay_serial_no, pay_type, `status`, meituan_status, staff_info, business_info, ", - "trade_expiring_time, create_time, pay_time, cancel_time, refund_time, finish_time, ", - "update_time, exception_status, exception_msg, ext_1, ext_2, ext_3", + "id, order_no, child_order_no, trade_no, sqt_biz_order_id, mer_id, mer_name, ", + "user_id, user_phone, first_business_type, second_business_type, ent_id, img, ", + "goods_name, trace_id, goods_count, total_price, total_deduction_price, coupon_discount_price, ", + "integral_discount_price, platform_code, pay_real_price, ent_pay_amount, business_discount_pay_amount, ", + "service_fee_amount, pay_channel, pay_serial_no, pay_type, `status`, meituan_status, ", + "staff_info, business_info, trade_expiring_time, create_time, pay_time, cancel_time, ", + "refund_time, finish_time, update_time, exception_status, exception_msg, ext_1, ", + "ext_2, ext_3", "from bs_order_meituan", "where id = #{id,jdbcType=BIGINT}" }) @@ -161,9 +156,7 @@ sqt_biz_order_id, mer_id, ", @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="trade_no", property="tradeNo", jdbcType=JdbcType.VARCHAR), - @Result(column="sqt_biz_order_id -sqt_biz_order_id", property="sqtBizOrderId -sqtBizOrderId", jdbcType=JdbcType.VARCHAR), + @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR), @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @@ -220,9 +213,7 @@ sqtBizOrderId", jdbcType=JdbcType.VARCHAR), "set order_no = #{orderNo,jdbcType=VARCHAR},", "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "trade_no = #{tradeNo,jdbcType=VARCHAR},", - "sqt_biz_order_id -sqt_biz_order_id = #{sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR},", + "sqt_biz_order_id = #{sqtBizOrderId,jdbcType=VARCHAR},", "mer_id = #{merId,jdbcType=BIGINT},", "mer_name = #{merName,jdbcType=VARCHAR},", "user_id = #{userId,jdbcType=BIGINT},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java index 4516261..720529c 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java @@ -40,11 +40,8 @@ public class BsOrderMeituanSqlProvider { sql.VALUES("trade_no", "#{tradeNo,jdbcType=VARCHAR}"); } - if (record.getSqtBizOrderId -sqtBizOrderId() != null) { - sql.VALUES("sqt_biz_order_id -sqt_biz_order_id", "#{sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR}"); + if (record.getSqtBizOrderId() != null) { + sql.VALUES("sqt_biz_order_id", "#{sqtBizOrderId,jdbcType=VARCHAR}"); } if (record.getMerId() != null) { @@ -216,8 +213,7 @@ sqtBizOrderId,jdbcType=VARCHAR}"); sql.SELECT("order_no"); sql.SELECT("child_order_no"); sql.SELECT("trade_no"); - sql.SELECT("sqt_biz_order_id -sqt_biz_order_id"); + sql.SELECT("sqt_biz_order_id"); sql.SELECT("mer_id"); sql.SELECT("mer_name"); sql.SELECT("user_id"); @@ -290,11 +286,8 @@ sqt_biz_order_id"); sql.SET("trade_no = #{record.tradeNo,jdbcType=VARCHAR}"); } - if (record.getSqtBizOrderId -sqtBizOrderId() != null) { - sql.SET("sqt_biz_order_id -sqt_biz_order_id = #{record.sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR}"); + if (record.getSqtBizOrderId() != null) { + sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}"); } if (record.getMerId() != null) { @@ -465,9 +458,7 @@ sqtBizOrderId,jdbcType=VARCHAR}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("trade_no = #{record.tradeNo,jdbcType=VARCHAR}"); - sql.SET("sqt_biz_order_id -sqt_biz_order_id = #{record.sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR}"); + sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}"); sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); @@ -529,11 +520,8 @@ sqtBizOrderId,jdbcType=VARCHAR}"); sql.SET("trade_no = #{tradeNo,jdbcType=VARCHAR}"); } - if (record.getSqtBizOrderId -sqtBizOrderId() != null) { - sql.SET("sqt_biz_order_id -sqt_biz_order_id = #{sqtBizOrderId -sqtBizOrderId,jdbcType=VARCHAR}"); + if (record.getSqtBizOrderId() != null) { + sql.SET("sqt_biz_order_id = #{sqtBizOrderId,jdbcType=VARCHAR}"); } if (record.getMerId() != null) { diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java index 9eb3b67..23dc5dd 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java @@ -37,8 +37,7 @@ public class BsOrderMeituan implements Serializable { /** * 美团企业版订单号 */ - private String sqtBizOrderId -sqtBizOrderId; + private String sqtBizOrderId; /** * 商户id @@ -264,18 +263,12 @@ sqtBizOrderId; this.tradeNo = tradeNo; } - public String getSqtBizOrderId -sqtBizOrderId() { - return sqtBizOrderId -sqtBizOrderId; + public String getSqtBizOrderId() { + return sqtBizOrderId; } - public void setSqtBizOrderId -sqtBizOrderId(String sqtBizOrderId -sqtBizOrderId) { - this.sqtBizOrderId -sqtBizOrderId = sqtBizOrderId -sqtBizOrderId; + public void setSqtBizOrderId(String sqtBizOrderId) { + this.sqtBizOrderId = sqtBizOrderId; } public Long getMerId() { @@ -606,11 +599,7 @@ sqtBizOrderId; && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) && (this.getTradeNo() == null ? other.getTradeNo() == null : this.getTradeNo().equals(other.getTradeNo())) - && (this.getSqtBizOrderId -sqtBizOrderId() == null ? other.getSqtBizOrderId -sqtBizOrderId() == null : this.getSqtBizOrderId -sqtBizOrderId().equals(other.getSqtBizOrderId -sqtBizOrderId())) + && (this.getSqtBizOrderId() == null ? other.getSqtBizOrderId() == null : this.getSqtBizOrderId().equals(other.getSqtBizOrderId())) && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) && (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) @@ -660,9 +649,7 @@ sqtBizOrderId())) result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); result = prime * result + ((getTradeNo() == null) ? 0 : getTradeNo().hashCode()); - result = prime * result + ((getSqtBizOrderId -sqtBizOrderId() == null) ? 0 : getSqtBizOrderId -sqtBizOrderId().hashCode()); + result = prime * result + ((getSqtBizOrderId() == null) ? 0 : getSqtBizOrderId().hashCode()); result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); @@ -715,9 +702,7 @@ sqtBizOrderId().hashCode()); sb.append(", orderNo=").append(orderNo); sb.append(", childOrderNo=").append(childOrderNo); sb.append(", tradeNo=").append(tradeNo); - sb.append(", sqtBizOrderId -sqtBizOrderId=").append(sqtBizOrderId -sqtBizOrderId); + sb.append(", sqtBizOrderId=").append(sqtBizOrderId); sb.append(", merId=").append(merId); sb.append(", merName=").append(merName); sb.append(", userId=").append(userId); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java index 5398f10..4d528e9 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java @@ -396,113 +396,73 @@ public class BsOrderMeituanExample { return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdIsNull() { - addCriterion("sqt_biz_order_id -sqt_biz_order_id is null"); + public Criteria andSqtBizOrderIdIsNull() { + addCriterion("sqt_biz_order_id is null"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdIsNotNull() { - addCriterion("sqt_biz_order_id -sqt_biz_order_id is not null"); + public Criteria andSqtBizOrderIdIsNotNull() { + addCriterion("sqt_biz_order_id is not null"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdEqualTo(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id =", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdEqualTo(String value) { + addCriterion("sqt_biz_order_id =", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdNotEqualTo(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id <>", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdNotEqualTo(String value) { + addCriterion("sqt_biz_order_id <>", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdGreaterThan(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id >", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdGreaterThan(String value) { + addCriterion("sqt_biz_order_id >", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdGreaterThanOrEqualTo(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id >=", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdGreaterThanOrEqualTo(String value) { + addCriterion("sqt_biz_order_id >=", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdLessThan(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id <", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdLessThan(String value) { + addCriterion("sqt_biz_order_id <", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdLessThanOrEqualTo(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id <=", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdLessThanOrEqualTo(String value) { + addCriterion("sqt_biz_order_id <=", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdLike(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id like", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdLike(String value) { + addCriterion("sqt_biz_order_id like", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdNotLike(String value) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id not like", value, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdNotLike(String value) { + addCriterion("sqt_biz_order_id not like", value, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdIn(List values) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id in", values, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdIn(List values) { + addCriterion("sqt_biz_order_id in", values, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdNotIn(List values) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id not in", values, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdNotIn(List values) { + addCriterion("sqt_biz_order_id not in", values, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdBetween(String value1, String value2) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id between", value1, value2, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdBetween(String value1, String value2) { + addCriterion("sqt_biz_order_id between", value1, value2, "sqtBizOrderId"); return (Criteria) this; } - public Criteria andSqtBizOrderId -sqtBizOrderIdNotBetween(String value1, String value2) { - addCriterion("sqt_biz_order_id -sqt_biz_order_id not between", value1, value2, "sqtBizOrderId -sqtBizOrderId"); + public Criteria andSqtBizOrderIdNotBetween(String value1, String value2) { + addCriterion("sqt_biz_order_id not between", value1, value2, "sqtBizOrderId"); return (Criteria) this; }