1

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
+        "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, ",
@@ -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
+        "#{tradeNo,jdbcType=VARCHAR}, #{sqtBizOrderId,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
+        @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR),
-sqt_biz_order_id", property="sqtBizOrderId
-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
+        "id, order_no, child_order_no, trade_no, sqt_biz_order_id, mer_id, mer_name, ",
-sqt_biz_order_id, mer_id, ",
+        "user_id, user_phone, first_business_type, second_business_type, ent_id, img, ",
-        "mer_name, user_id, user_phone, first_business_type, second_business_type, ent_id, ",
+        "goods_name, trace_id, goods_count, total_price, total_deduction_price, coupon_discount_price, ",
-        "img, goods_name, trace_id, goods_count, total_price, total_deduction_price, ",
+        "integral_discount_price, platform_code, pay_real_price, ent_pay_amount, business_discount_pay_amount, ",
-        "coupon_discount_price, integral_discount_price, platform_code, pay_real_price, ",
+        "service_fee_amount, pay_channel, pay_serial_no, pay_type, `status`, meituan_status, ",
-        "ent_pay_amount, business_discount_pay_amount, service_fee_amount, pay_channel, ",
+        "staff_info, business_info, trade_expiring_time, create_time, pay_time, cancel_time, ",
-        "pay_serial_no, pay_type, `status`, meituan_status, staff_info, business_info, ",
+        "refund_time, finish_time, update_time, exception_status, exception_msg, ext_1, ",
-        "trade_expiring_time, create_time, pay_time, cancel_time, refund_time, finish_time, ",
+        "ext_2, ext_3",
-        "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
+        @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR),
-sqt_biz_order_id", property="sqtBizOrderId
-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,jdbcType=VARCHAR},",
-sqt_biz_order_id = #{sqtBizOrderId
-sqtBizOrderId,jdbcType=VARCHAR},",
           "mer_id = #{merId,jdbcType=BIGINT},",
           "mer_name = #{merName,jdbcType=VARCHAR},",
           "user_id = #{userId,jdbcType=BIGINT},",

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
+        if (record.getSqtBizOrderId() != null) {
-sqtBizOrderId() != null) {
+            sql.VALUES("sqt_biz_order_id", "#{sqtBizOrderId,jdbcType=VARCHAR}");
-            sql.VALUES("sqt_biz_order_id
-sqt_biz_order_id", "#{sqtBizOrderId
-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
+        sql.SELECT("sqt_biz_order_id");
-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
+        if (record.getSqtBizOrderId() != null) {
-sqtBizOrderId() != null) {
+            sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}");
-            sql.SET("sqt_biz_order_id
-sqt_biz_order_id = #{record.sqtBizOrderId
-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
+        sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}");
-sqt_biz_order_id = #{record.sqtBizOrderId
-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
+        if (record.getSqtBizOrderId() != null) {
-sqtBizOrderId() != null) {
+            sql.SET("sqt_biz_order_id = #{sqtBizOrderId,jdbcType=VARCHAR}");
-            sql.SET("sqt_biz_order_id
-sqt_biz_order_id = #{sqtBizOrderId
-sqtBizOrderId,jdbcType=VARCHAR}");
         }
         
         if (record.getMerId() != null) {

service/src/main/java/com/hfkj/entity/BsOrderMeituan.java

@@ -37,8 +37,7 @@ public class BsOrderMeituan implements Serializable {
     /**
      * 美团企业版订单号
      */
-    private String sqtBizOrderId
+    private String sqtBizOrderId;
-sqtBizOrderId;
 
     /**
      * 商户id
@@ -264,18 +263,12 @@ sqtBizOrderId;
         this.tradeNo = tradeNo;
     }
 
-    public String getSqtBizOrderId
+    public String getSqtBizOrderId() {
-sqtBizOrderId() {
+        return sqtBizOrderId;
-        return sqtBizOrderId
-sqtBizOrderId;
     }
 
-    public void setSqtBizOrderId
+    public void setSqtBizOrderId(String sqtBizOrderId) {
-sqtBizOrderId(String sqtBizOrderId
+        this.sqtBizOrderId = sqtBizOrderId;
-sqtBizOrderId) {
-        this.sqtBizOrderId
-sqtBizOrderId = 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
+            && (this.getSqtBizOrderId() == null ? other.getSqtBizOrderId() == null : this.getSqtBizOrderId().equals(other.getSqtBizOrderId()))
-sqtBizOrderId() == null ? other.getSqtBizOrderId
-sqtBizOrderId() == null : this.getSqtBizOrderId
-sqtBizOrderId().equals(other.getSqtBizOrderId
-sqtBizOrderId()))
             && (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
+        result = prime * result + ((getSqtBizOrderId() == null) ? 0 : getSqtBizOrderId().hashCode());
-sqtBizOrderId() == null) ? 0 : getSqtBizOrderId
-sqtBizOrderId().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
+        sb.append(", sqtBizOrderId=").append(sqtBizOrderId);
-sqtBizOrderId=").append(sqtBizOrderId
-sqtBizOrderId);
         sb.append(", merId=").append(merId);
         sb.append(", merName=").append(merName);
         sb.append(", userId=").append(userId);

service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java

@@ -396,113 +396,73 @@ public class BsOrderMeituanExample {
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdIsNull() {
-sqtBizOrderIdIsNull() {
+            addCriterion("sqt_biz_order_id is null");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdIsNotNull() {
-sqtBizOrderIdIsNotNull() {
+            addCriterion("sqt_biz_order_id is not null");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdEqualTo(String value) {
-sqtBizOrderIdEqualTo(String value) {
+            addCriterion("sqt_biz_order_id =", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id =", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdNotEqualTo(String value) {
-sqtBizOrderIdNotEqualTo(String value) {
+            addCriterion("sqt_biz_order_id <>", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id <>", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdGreaterThan(String value) {
-sqtBizOrderIdGreaterThan(String value) {
+            addCriterion("sqt_biz_order_id >", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id >", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdGreaterThanOrEqualTo(String value) {
-sqtBizOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("sqt_biz_order_id >=", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id >=", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdLessThan(String value) {
-sqtBizOrderIdLessThan(String value) {
+            addCriterion("sqt_biz_order_id <", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id <", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdLessThanOrEqualTo(String value) {
-sqtBizOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("sqt_biz_order_id <=", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id <=", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdLike(String value) {
-sqtBizOrderIdLike(String value) {
+            addCriterion("sqt_biz_order_id like", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id like", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdNotLike(String value) {
-sqtBizOrderIdNotLike(String value) {
+            addCriterion("sqt_biz_order_id not like", value, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id not like", value, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdIn(List<String> values) {
-sqtBizOrderIdIn(List<String> values) {
+            addCriterion("sqt_biz_order_id in", values, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id in", values, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdNotIn(List<String> values) {
-sqtBizOrderIdNotIn(List<String> values) {
+            addCriterion("sqt_biz_order_id not in", values, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id not in", values, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdBetween(String value1, String value2) {
-sqtBizOrderIdBetween(String value1, String value2) {
+            addCriterion("sqt_biz_order_id between", value1, value2, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id between", value1, value2, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }
 
-        public Criteria andSqtBizOrderId
+        public Criteria andSqtBizOrderIdNotBetween(String value1, String value2) {
-sqtBizOrderIdNotBetween(String value1, String value2) {
+            addCriterion("sqt_biz_order_id not between", value1, value2, "sqtBizOrderId");
-            addCriterion("sqt_biz_order_id
-sqt_biz_order_id not between", value1, value2, "sqtBizOrderId
-sqtBizOrderId");
             return (Criteria) this;
         }