优惠券接口修改

2018-11-09 16:16:17 +08:00
parent 483721db8f
commit 7d3b72bd93
14 changed files with 1874 additions and 1336 deletions
--- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelation.java
+++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelation.java
@@ -9,6 +9,20 @@ public class SmsCouponProductCategoryRelation implements Serializable {

    private Long productCategoryId;

+    /**
+     * 产品分类名称
+     *
+     * @mbggenerated
+     */
+    private String productCategoryName;
+
+    /**
+     * 父分类名称
+     *
+     * @mbggenerated
+     */
+    private String parentCategoryName;
+
    private static final long serialVersionUID = 1L;

    public Long getId() {
@@ -35,6 +49,22 @@ public class SmsCouponProductCategoryRelation implements Serializable {
        this.productCategoryId = productCategoryId;
    }

+    public String getProductCategoryName() {
+        return productCategoryName;
+    }
+
+    public void setProductCategoryName(String productCategoryName) {
+        this.productCategoryName = productCategoryName;
+    }
+
+    public String getParentCategoryName() {
+        return parentCategoryName;
+    }
+
+    public void setParentCategoryName(String parentCategoryName) {
+        this.parentCategoryName = parentCategoryName;
+    }
+
    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
@@ -44,6 +74,8 @@ public class SmsCouponProductCategoryRelation implements Serializable {
        sb.append(", id=").append(id);
        sb.append(", couponId=").append(couponId);
        sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productCategoryName=").append(productCategoryName);
+        sb.append(", parentCategoryName=").append(parentCategoryName);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
--- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java
+++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java
@@ -283,6 +283,146 @@ public class SmsCouponProductCategoryRelationExample {
            addCriterion("product_category_id not between", value1, value2, "productCategoryId");
            return (Criteria) this;
        }
+
+        public Criteria andProductCategoryNameIsNull() {
+            addCriterion("product_category_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameIsNotNull() {
+            addCriterion("product_category_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameEqualTo(String value) {
+            addCriterion("product_category_name =", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotEqualTo(String value) {
+            addCriterion("product_category_name <>", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameGreaterThan(String value) {
+            addCriterion("product_category_name >", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_category_name >=", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLessThan(String value) {
+            addCriterion("product_category_name <", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLessThanOrEqualTo(String value) {
+            addCriterion("product_category_name <=", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLike(String value) {
+            addCriterion("product_category_name like", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotLike(String value) {
+            addCriterion("product_category_name not like", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameIn(List<String> values) {
+            addCriterion("product_category_name in", values, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotIn(List<String> values) {
+            addCriterion("product_category_name not in", values, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameBetween(String value1, String value2) {
+            addCriterion("product_category_name between", value1, value2, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotBetween(String value1, String value2) {
+            addCriterion("product_category_name not between", value1, value2, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameIsNull() {
+            addCriterion("parent_category_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameIsNotNull() {
+            addCriterion("parent_category_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameEqualTo(String value) {
+            addCriterion("parent_category_name =", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameNotEqualTo(String value) {
+            addCriterion("parent_category_name <>", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameGreaterThan(String value) {
+            addCriterion("parent_category_name >", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("parent_category_name >=", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameLessThan(String value) {
+            addCriterion("parent_category_name <", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameLessThanOrEqualTo(String value) {
+            addCriterion("parent_category_name <=", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameLike(String value) {
+            addCriterion("parent_category_name like", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameNotLike(String value) {
+            addCriterion("parent_category_name not like", value, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameIn(List<String> values) {
+            addCriterion("parent_category_name in", values, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameNotIn(List<String> values) {
+            addCriterion("parent_category_name not in", values, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameBetween(String value1, String value2) {
+            addCriterion("parent_category_name between", value1, value2, "parentCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentCategoryNameNotBetween(String value1, String value2) {
+            addCriterion("parent_category_name not between", value1, value2, "parentCategoryName");
+            return (Criteria) this;
+        }
    }

    public static class Criteria extends GeneratedCriteria {
--- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelation.java
+++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelation.java
@@ -9,6 +9,20 @@ public class SmsCouponProductRelation implements Serializable {

    private Long productId;

+    /**
+     * 商品名称
+     *
+     * @mbggenerated
+     */
+    private String productName;
+
+    /**
+     * 商品编码
+     *
+     * @mbggenerated
+     */
+    private String productSn;
+
    private static final long serialVersionUID = 1L;

    public Long getId() {
@@ -35,6 +49,22 @@ public class SmsCouponProductRelation implements Serializable {
        this.productId = productId;
    }

+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductSn() {
+        return productSn;
+    }
+
+    public void setProductSn(String productSn) {
+        this.productSn = productSn;
+    }
+
    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
@@ -44,6 +74,8 @@ public class SmsCouponProductRelation implements Serializable {
        sb.append(", id=").append(id);
        sb.append(", couponId=").append(couponId);
        sb.append(", productId=").append(productId);
+        sb.append(", productName=").append(productName);
+        sb.append(", productSn=").append(productSn);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
--- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java
+++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java
@@ -283,6 +283,146 @@ public class SmsCouponProductRelationExample {
            addCriterion("product_id not between", value1, value2, "productId");
            return (Criteria) this;
        }
+
+        public Criteria andProductNameIsNull() {
+            addCriterion("product_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNotNull() {
+            addCriterion("product_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameEqualTo(String value) {
+            addCriterion("product_name =", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotEqualTo(String value) {
+            addCriterion("product_name <>", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThan(String value) {
+            addCriterion("product_name >", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_name >=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThan(String value) {
+            addCriterion("product_name <", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThanOrEqualTo(String value) {
+            addCriterion("product_name <=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLike(String value) {
+            addCriterion("product_name like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotLike(String value) {
+            addCriterion("product_name not like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIn(List<String> values) {
+            addCriterion("product_name in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotIn(List<String> values) {
+            addCriterion("product_name not in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameBetween(String value1, String value2) {
+            addCriterion("product_name between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotBetween(String value1, String value2) {
+            addCriterion("product_name not between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIsNull() {
+            addCriterion("product_sn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIsNotNull() {
+            addCriterion("product_sn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnEqualTo(String value) {
+            addCriterion("product_sn =", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotEqualTo(String value) {
+            addCriterion("product_sn <>", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnGreaterThan(String value) {
+            addCriterion("product_sn >", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnGreaterThanOrEqualTo(String value) {
+            addCriterion("product_sn >=", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLessThan(String value) {
+            addCriterion("product_sn <", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLessThanOrEqualTo(String value) {
+            addCriterion("product_sn <=", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLike(String value) {
+            addCriterion("product_sn like", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotLike(String value) {
+            addCriterion("product_sn not like", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIn(List<String> values) {
+            addCriterion("product_sn in", values, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotIn(List<String> values) {
+            addCriterion("product_sn not in", values, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnBetween(String value1, String value2) {
+            addCriterion("product_sn between", value1, value2, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotBetween(String value1, String value2) {
+            addCriterion("product_sn not between", value1, value2, "productSn");
+            return (Criteria) this;
+        }
    }

    public static class Criteria extends GeneratedCriteria {