下单接口完善，添加支付成功回调及自动取消超时订单接口

mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java

@@ -261,6 +261,13 @@ public class OmsOrder implements Serializable {
      */
     private Integer deleteStatus;
 
+    /**
+     * 下单时使用的积分
+     *
+     * @mbggenerated
+     */
+    private Integer useIntegration;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -567,6 +574,14 @@ public class OmsOrder implements Serializable {
         this.deleteStatus = deleteStatus;
     }
 
+    public Integer getUseIntegration() {
+        return useIntegration;
+    }
+
+    public void setUseIntegration(Integer useIntegration) {
+        this.useIntegration = useIntegration;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -611,6 +626,7 @@ public class OmsOrder implements Serializable {
         sb.append(", note=").append(note);
         sb.append(", confirmStatus=").append(confirmStatus);
         sb.append(", deleteStatus=").append(deleteStatus);
+        sb.append(", useIntegration=").append(useIntegration);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java

@@ -2555,6 +2555,66 @@ public class OmsOrderExample {
             addCriterion("delete_status not between", value1, value2, "deleteStatus");
             return (Criteria) this;
         }
+
+        public Criteria andUseIntegrationIsNull() {
+            addCriterion("use_integration is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationIsNotNull() {
+            addCriterion("use_integration is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationEqualTo(Integer value) {
+            addCriterion("use_integration =", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationNotEqualTo(Integer value) {
+            addCriterion("use_integration <>", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationGreaterThan(Integer value) {
+            addCriterion("use_integration >", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationGreaterThanOrEqualTo(Integer value) {
+            addCriterion("use_integration >=", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationLessThan(Integer value) {
+            addCriterion("use_integration <", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationLessThanOrEqualTo(Integer value) {
+            addCriterion("use_integration <=", value, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationIn(List<Integer> values) {
+            addCriterion("use_integration in", values, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationNotIn(List<Integer> values) {
+            addCriterion("use_integration not in", values, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationBetween(Integer value1, Integer value2) {
+            addCriterion("use_integration between", value1, value2, "useIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseIntegrationNotBetween(Integer value1, Integer value2) {
+            addCriterion("use_integration not between", value1, value2, "useIntegration");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {