提交代码

hai-service/src/main/java/com/hai/dao/HighCouponMapper.java

@@ -51,7 +51,8 @@ public interface HighCouponMapper extends HighCouponMapperExt {
         "operator_id, operator_name, ",
         "pay_type, ext_1, ext_2, ",
         "ext_3, `status`, display_area, ",
-        "coupon_source, distributor)",
+        "coupon_source, distributor, ",
+        "goodsTypeId, brandId)",
         "values (#{companyId,jdbcType=BIGINT}, #{merchantId,jdbcType=BIGINT}, ",
         "#{couponKey,jdbcType=VARCHAR}, #{couponName,jdbcType=VARCHAR}, ",
         "#{couponPrice,jdbcType=DECIMAL}, #{couponImg,jdbcType=VARCHAR}, ",
@@ -64,7 +65,8 @@ public interface HighCouponMapper extends HighCouponMapperExt {
         "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
         "#{payType,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
         "#{ext3,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{displayArea,jdbcType=INTEGER}, ",
-        "#{couponSource,jdbcType=INTEGER}, #{distributor,jdbcType=INTEGER})"
+        "#{couponSource,jdbcType=INTEGER}, #{distributor,jdbcType=INTEGER}, ",
+        "#{goodstypeid,jdbcType=INTEGER}, #{brandid,jdbcType=INTEGER})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(HighCoupon record);
@@ -103,7 +105,9 @@ public interface HighCouponMapper extends HighCouponMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="display_area", property="displayArea", jdbcType=JdbcType.INTEGER),
         @Result(column="coupon_source", property="couponSource", jdbcType=JdbcType.INTEGER),
-        @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER)
+        @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER),
+        @Result(column="goodsTypeId", property="goodstypeid", jdbcType=JdbcType.INTEGER),
+        @Result(column="brandId", property="brandid", jdbcType=JdbcType.INTEGER)
     })
     List<HighCoupon> selectByExample(HighCouponExample example);
 
@@ -113,7 +117,7 @@ public interface HighCouponMapper extends HighCouponMapperExt {
         "coupon_carousel_img, coupon_desc, coupon_type, sales_end_time, recycle_day, ",
         "limit_number, sales_price, discount_price, sales_count, is_present, create_time, ",
         "update_time, operator_id, operator_name, pay_type, ext_1, ext_2, ext_3, `status`, ",
-        "display_area, coupon_source, distributor",
+        "display_area, coupon_source, distributor, goodsTypeId, brandId",
         "from high_coupon",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -146,7 +150,9 @@ public interface HighCouponMapper extends HighCouponMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="display_area", property="displayArea", jdbcType=JdbcType.INTEGER),
         @Result(column="coupon_source", property="couponSource", jdbcType=JdbcType.INTEGER),
-        @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER)
+        @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER),
+        @Result(column="goodsTypeId", property="goodstypeid", jdbcType=JdbcType.INTEGER),
+        @Result(column="brandId", property="brandid", jdbcType=JdbcType.INTEGER)
     })
     HighCoupon selectByPrimaryKey(Long id);
 
@@ -188,7 +194,9 @@ public interface HighCouponMapper extends HighCouponMapperExt {
           "`status` = #{status,jdbcType=INTEGER},",
           "display_area = #{displayArea,jdbcType=INTEGER},",
           "coupon_source = #{couponSource,jdbcType=INTEGER},",
-          "distributor = #{distributor,jdbcType=INTEGER}",
+          "distributor = #{distributor,jdbcType=INTEGER},",
+          "goodsTypeId = #{goodstypeid,jdbcType=INTEGER},",
+          "brandId = #{brandid,jdbcType=INTEGER}",
         "where id = #{id,jdbcType=BIGINT}"
     })
     int updateByPrimaryKey(HighCoupon record);

hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java

@@ -140,6 +140,14 @@ public class HighCouponSqlProvider {
             sql.VALUES("distributor", "#{distributor,jdbcType=INTEGER}");
         }
         
+        if (record.getGoodstypeid() != null) {
+            sql.VALUES("goodsTypeId", "#{goodstypeid,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandid() != null) {
+            sql.VALUES("brandId", "#{brandid,jdbcType=INTEGER}");
+        }
+        
         return sql.toString();
     }
 
@@ -178,6 +186,8 @@ public class HighCouponSqlProvider {
         sql.SELECT("display_area");
         sql.SELECT("coupon_source");
         sql.SELECT("distributor");
+        sql.SELECT("goodsTypeId");
+        sql.SELECT("brandId");
         sql.FROM("high_coupon");
         applyWhere(sql, example, false);
         
@@ -311,6 +321,14 @@ public class HighCouponSqlProvider {
             sql.SET("distributor = #{record.distributor,jdbcType=INTEGER}");
         }
         
+        if (record.getGoodstypeid() != null) {
+            sql.SET("goodsTypeId = #{record.goodstypeid,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandid() != null) {
+            sql.SET("brandId = #{record.brandid,jdbcType=INTEGER}");
+        }
+        
         applyWhere(sql, example, true);
         return sql.toString();
     }
@@ -348,6 +366,8 @@ public class HighCouponSqlProvider {
         sql.SET("display_area = #{record.displayArea,jdbcType=INTEGER}");
         sql.SET("coupon_source = #{record.couponSource,jdbcType=INTEGER}");
         sql.SET("distributor = #{record.distributor,jdbcType=INTEGER}");
+        sql.SET("goodsTypeId = #{record.goodstypeid,jdbcType=INTEGER}");
+        sql.SET("brandId = #{record.brandid,jdbcType=INTEGER}");
         
         HighCouponExample example = (HighCouponExample) parameter.get("example");
         applyWhere(sql, example, true);
@@ -470,6 +490,14 @@ public class HighCouponSqlProvider {
             sql.SET("distributor = #{distributor,jdbcType=INTEGER}");
         }
         
+        if (record.getGoodstypeid() != null) {
+            sql.SET("goodsTypeId = #{goodstypeid,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandid() != null) {
+            sql.SET("brandId = #{brandid,jdbcType=INTEGER}");
+        }
+        
         sql.WHERE("id = #{id,jdbcType=BIGINT}");
         
         return sql.toString();

hai-service/src/main/java/com/hai/entity/HighCoupon.java

@@ -138,7 +138,7 @@ public class HighCoupon extends HighCouponModel implements Serializable {
     private Integer status;
 
     /**
-     * 1.赠券专区 2.金币专区
+     * 1.赠券专区 2.金币专区 。3 。银联专区 4. 优选商品
      */
     private Integer displayArea;
 
@@ -152,6 +152,16 @@ public class HighCoupon extends HighCouponModel implements Serializable {
      */
     private Integer distributor;
 
+    /**
+     * 商品类别id
+     */
+    private Integer goodstypeid;
+
+    /**
+     * 品牌ID
+     */
+    private Integer brandid;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -386,6 +396,22 @@ public class HighCoupon extends HighCouponModel implements Serializable {
         this.distributor = distributor;
     }
 
+    public Integer getGoodstypeid() {
+        return goodstypeid;
+    }
+
+    public void setGoodstypeid(Integer goodstypeid) {
+        this.goodstypeid = goodstypeid;
+    }
+
+    public Integer getBrandid() {
+        return brandid;
+    }
+
+    public void setBrandid(Integer brandid) {
+        this.brandid = brandid;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -426,7 +452,9 @@ public class HighCoupon extends HighCouponModel implements Serializable {
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getDisplayArea() == null ? other.getDisplayArea() == null : this.getDisplayArea().equals(other.getDisplayArea()))
             && (this.getCouponSource() == null ? other.getCouponSource() == null : this.getCouponSource().equals(other.getCouponSource()))
-            && (this.getDistributor() == null ? other.getDistributor() == null : this.getDistributor().equals(other.getDistributor()));
+            && (this.getDistributor() == null ? other.getDistributor() == null : this.getDistributor().equals(other.getDistributor()))
+            && (this.getGoodstypeid() == null ? other.getGoodstypeid() == null : this.getGoodstypeid().equals(other.getGoodstypeid()))
+            && (this.getBrandid() == null ? other.getBrandid() == null : this.getBrandid().equals(other.getBrandid()));
     }
 
     @Override
@@ -462,6 +490,8 @@ public class HighCoupon extends HighCouponModel implements Serializable {
         result = prime * result + ((getDisplayArea() == null) ? 0 : getDisplayArea().hashCode());
         result = prime * result + ((getCouponSource() == null) ? 0 : getCouponSource().hashCode());
         result = prime * result + ((getDistributor() == null) ? 0 : getDistributor().hashCode());
+        result = prime * result + ((getGoodstypeid() == null) ? 0 : getGoodstypeid().hashCode());
+        result = prime * result + ((getBrandid() == null) ? 0 : getBrandid().hashCode());
         return result;
     }
 
@@ -500,6 +530,8 @@ public class HighCoupon extends HighCouponModel implements Serializable {
         sb.append(", displayArea=").append(displayArea);
         sb.append(", couponSource=").append(couponSource);
         sb.append(", distributor=").append(distributor);
+        sb.append(", goodstypeid=").append(goodstypeid);
+        sb.append(", brandid=").append(brandid);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

hai-service/src/main/java/com/hai/entity/HighCouponExample.java

@@ -1955,6 +1955,126 @@ public class HighCouponExample {
             addCriterion("distributor not between", value1, value2, "distributor");
             return (Criteria) this;
         }
+
+        public Criteria andGoodstypeidIsNull() {
+            addCriterion("goodsTypeId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidIsNotNull() {
+            addCriterion("goodsTypeId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidEqualTo(Integer value) {
+            addCriterion("goodsTypeId =", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidNotEqualTo(Integer value) {
+            addCriterion("goodsTypeId <>", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidGreaterThan(Integer value) {
+            addCriterion("goodsTypeId >", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("goodsTypeId >=", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidLessThan(Integer value) {
+            addCriterion("goodsTypeId <", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidLessThanOrEqualTo(Integer value) {
+            addCriterion("goodsTypeId <=", value, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidIn(List<Integer> values) {
+            addCriterion("goodsTypeId in", values, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidNotIn(List<Integer> values) {
+            addCriterion("goodsTypeId not in", values, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidBetween(Integer value1, Integer value2) {
+            addCriterion("goodsTypeId between", value1, value2, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodstypeidNotBetween(Integer value1, Integer value2) {
+            addCriterion("goodsTypeId not between", value1, value2, "goodstypeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidIsNull() {
+            addCriterion("brandId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidIsNotNull() {
+            addCriterion("brandId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidEqualTo(Integer value) {
+            addCriterion("brandId =", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidNotEqualTo(Integer value) {
+            addCriterion("brandId <>", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidGreaterThan(Integer value) {
+            addCriterion("brandId >", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("brandId >=", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidLessThan(Integer value) {
+            addCriterion("brandId <", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidLessThanOrEqualTo(Integer value) {
+            addCriterion("brandId <=", value, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidIn(List<Integer> values) {
+            addCriterion("brandId in", values, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidNotIn(List<Integer> values) {
+            addCriterion("brandId not in", values, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidBetween(Integer value1, Integer value2) {
+            addCriterion("brandId between", value1, value2, "brandid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandidNotBetween(Integer value1, Integer value2) {
+            addCriterion("brandId not between", value1, value2, "brandid");
+            return (Criteria) this;
+        }
     }
 
     /**