修改销售周期字段类型

Signed-off-by: fengb <fengbin1989@aliyun.com>

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java

@@ -1,13 +1,11 @@
 package cc.hiver.mall.dao.mapper;
 
-import cc.hiver.mall.entity.Goods;
 import cc.hiver.mall.entity.Stock;
 import cc.hiver.mall.entity.StockExample;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import javax.annotation.Resource;
 import java.util.List;
 @Repository
 public interface StockMapper extends BaseMapper<Stock> {

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java

@@ -68,11 +68,14 @@ public class Product implements Serializable {
     private String productIntro;
 
     @ApiModelProperty(value = "销售周期")
-    private String salesWeek;
+    private Date salesWeek;
 
     @ApiModelProperty(value = "打印条码（自己制作的）")
     private String printBarcode;
 
+    @ApiModelProperty(value = "尾货预警")
+    private Integer tailWarn;
+
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -235,20 +238,28 @@ public class Product implements Serializable {
         this.productIntro = productIntro;
     }
 
-    public String getSalesWeek() {
+    public String getPrintBarcode() {
+        return printBarcode;
+    }
+
+    public void setPrintBarcode(String printBarcode) {
+        this.printBarcode = printBarcode;
+    }
+
+    public Date getSalesWeek() {
         return salesWeek;
     }
 
-    public void setSalesWeek(String salesWeek) {
+    public void setSalesWeek(Date salesWeek) {
         this.salesWeek = salesWeek;
     }
 
-    public String getPrintBarcode() {
+    public Integer getTailWarn() {
-        return printBarcode;
+        return tailWarn;
     }
 
-    public void setPrintBarcode(String printBarcode) {
+    public void setTailWarn(Integer tailWarn) {
-        this.printBarcode = printBarcode;
+        this.tailWarn = tailWarn;
     }
 
     @Override

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductExample.java

@@ -1456,62 +1456,52 @@ public class ProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekEqualTo(String value) {
+        public Criteria andSalesWeekEqualTo(Date value) {
             addCriterion("sales_week =", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotEqualTo(String value) {
+        public Criteria andSalesWeekNotEqualTo(Date value) {
             addCriterion("sales_week <>", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThan(String value) {
+        public Criteria andSalesWeekGreaterThan(Date value) {
             addCriterion("sales_week >", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThanOrEqualTo(String value) {
+        public Criteria andSalesWeekGreaterThanOrEqualTo(Date value) {
             addCriterion("sales_week >=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThan(String value) {
+        public Criteria andSalesWeekLessThan(Date value) {
             addCriterion("sales_week <", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThanOrEqualTo(String value) {
+        public Criteria andSalesWeekLessThanOrEqualTo(Date value) {
             addCriterion("sales_week <=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLike(String value) {
+        public Criteria andSalesWeekIn(List<Date> values) {
-            addCriterion("sales_week like", value, "salesWeek");
-            return (Criteria) this;
-        }
-
-        public Criteria andSalesWeekNotLike(String value) {
-            addCriterion("sales_week not like", value, "salesWeek");
-            return (Criteria) this;
-        }
-
-        public Criteria andSalesWeekIn(List<String> values) {
             addCriterion("sales_week in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotIn(List<String> values) {
+        public Criteria andSalesWeekNotIn(List<Date> values) {
             addCriterion("sales_week not in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekBetween(String value1, String value2) {
+        public Criteria andSalesWeekBetween(Date value1, Date value2) {
             addCriterion("sales_week between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotBetween(String value1, String value2) {
+        public Criteria andSalesWeekNotBetween(Date value1, Date value2) {
             addCriterion("sales_week not between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
@@ -1585,6 +1575,66 @@ public class ProductExample {
             addCriterion("print_barcode not between", value1, value2, "printBarcode");
             return (Criteria) this;
         }
+
+        public Criteria andTailWarnIsNull() {
+            addCriterion("tail_warn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnIsNotNull() {
+            addCriterion("tail_warn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnEqualTo(Integer value) {
+            addCriterion("tail_warn =", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotEqualTo(Integer value) {
+            addCriterion("tail_warn <>", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThan(Integer value) {
+            addCriterion("tail_warn >", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn >=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThan(Integer value) {
+            addCriterion("tail_warn <", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn <=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnIn(List<Integer> values) {
+            addCriterion("tail_warn in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotIn(List<Integer> values) {
+            addCriterion("tail_warn not in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn between", value1, value2, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn not between", value1, value2, "tailWarn");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java

@@ -73,7 +73,10 @@ public class PurchaseDetail implements Serializable {
     private String productIntro;
 
     @ApiModelProperty(value = "销售周期")
-    private String salesWeek;
+    private Date salesWeek;
+
+    @ApiModelProperty(value = "尾货预警")
+    private Integer tailWarn;
 
     @ApiModelProperty(value = "打印条码（自己制作的）")
     private String printBarcode;
@@ -259,14 +262,22 @@ public class PurchaseDetail implements Serializable {
         this.productIntro = productIntro;
     }
 
-    public String getSalesWeek() {
+    public Date getSalesWeek() {
         return salesWeek;
     }
 
-    public void setSalesWeek(String salesWeek) {
+    public void setSalesWeek(Date salesWeek) {
         this.salesWeek = salesWeek;
     }
 
+    public Integer getTailWarn() {
+        return tailWarn;
+    }
+
+    public void setTailWarn(Integer tailWarn) {
+        this.tailWarn = tailWarn;
+    }
+
     public String getPrintBarcode() {
         return printBarcode;
     }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java

@@ -1596,63 +1596,113 @@ public class PurchaseDetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekEqualTo(String value) {
+        public Criteria andSalesWeekEqualTo(Date value) {
             addCriterion("sales_week =", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotEqualTo(String value) {
+        public Criteria andSalesWeekNotEqualTo(Date value) {
             addCriterion("sales_week <>", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThan(String value) {
+        public Criteria andSalesWeekGreaterThan(Date value) {
             addCriterion("sales_week >", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThanOrEqualTo(String value) {
+        public Criteria andSalesWeekGreaterThanOrEqualTo(Date value) {
             addCriterion("sales_week >=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThan(String value) {
+        public Criteria andSalesWeekLessThan(Date value) {
             addCriterion("sales_week <", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThanOrEqualTo(String value) {
+        public Criteria andSalesWeekLessThanOrEqualTo(Date value) {
             addCriterion("sales_week <=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLike(String value) {
+        public Criteria andSalesWeekIn(List<Date> values) {
-            addCriterion("sales_week like", value, "salesWeek");
+            addCriterion("sales_week in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotLike(String value) {
+        public Criteria andSalesWeekNotIn(List<Date> values) {
-            addCriterion("sales_week not like", value, "salesWeek");
+            addCriterion("sales_week not in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekIn(List<String> values) {
+        public Criteria andSalesWeekBetween(Date value1, Date value2) {
-            addCriterion("sales_week in", values, "salesWeek");
+            addCriterion("sales_week between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotIn(List<String> values) {
+        public Criteria andSalesWeekNotBetween(Date value1, Date value2) {
-            addCriterion("sales_week not in", values, "salesWeek");
+            addCriterion("sales_week not between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekBetween(String value1, String value2) {
+        public Criteria andTailWarnIsNull() {
-            addCriterion("sales_week between", value1, value2, "salesWeek");
+            addCriterion("tail_warn is null");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotBetween(String value1, String value2) {
+        public Criteria andTailWarnIsNotNull() {
-            addCriterion("sales_week not between", value1, value2, "salesWeek");
+            addCriterion("tail_warn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnEqualTo(Integer value) {
+            addCriterion("tail_warn =", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotEqualTo(Integer value) {
+            addCriterion("tail_warn <>", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThan(Integer value) {
+            addCriterion("tail_warn >", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn >=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThan(Integer value) {
+            addCriterion("tail_warn <", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn <=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnIn(List<Integer> values) {
+            addCriterion("tail_warn in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotIn(List<Integer> values) {
+            addCriterion("tail_warn not in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn between", value1, value2, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn not between", value1, value2, "tailWarn");
             return (Criteria) this;
         }
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java

@@ -70,7 +70,10 @@ public class Stock implements Serializable {
     private String productIntro;
 
     @ApiModelProperty(value = "销售周期")
-    private String salesWeek;
+    private Date salesWeek;
+
+    @ApiModelProperty(value = "尾货预警")
+    private Integer tailWarn;
 
     @ApiModelProperty(value = "打印条码（自己制作的）")
     private String printBarcode;
@@ -251,14 +254,22 @@ public class Stock implements Serializable {
         this.productIntro = productIntro;
     }
 
-    public String getSalesWeek() {
+    public Date getSalesWeek() {
         return salesWeek;
     }
 
-    public void setSalesWeek(String salesWeek) {
+    public void setSalesWeek(Date salesWeek) {
         this.salesWeek = salesWeek;
     }
 
+    public Integer getTailWarn() {
+        return tailWarn;
+    }
+
+    public void setTailWarn(Integer tailWarn) {
+        this.tailWarn = tailWarn;
+    }
+
     public String getPrintBarcode() {
         return printBarcode;
     }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockExample.java

@@ -1526,62 +1526,52 @@ public class StockExample {
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekEqualTo(String value) {
+        public Criteria andSalesWeekEqualTo(Date value) {
             addCriterion("sales_week =", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotEqualTo(String value) {
+        public Criteria andSalesWeekNotEqualTo(Date value) {
             addCriterion("sales_week <>", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThan(String value) {
+        public Criteria andSalesWeekGreaterThan(Date value) {
             addCriterion("sales_week >", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekGreaterThanOrEqualTo(String value) {
+        public Criteria andSalesWeekGreaterThanOrEqualTo(Date value) {
             addCriterion("sales_week >=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThan(String value) {
+        public Criteria andSalesWeekLessThan(Date value) {
             addCriterion("sales_week <", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLessThanOrEqualTo(String value) {
+        public Criteria andSalesWeekLessThanOrEqualTo(Date value) {
             addCriterion("sales_week <=", value, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekLike(String value) {
+        public Criteria andSalesWeekIn(List<Date> values) {
-            addCriterion("sales_week like", value, "salesWeek");
-            return (Criteria) this;
-        }
-
-        public Criteria andSalesWeekNotLike(String value) {
-            addCriterion("sales_week not like", value, "salesWeek");
-            return (Criteria) this;
-        }
-
-        public Criteria andSalesWeekIn(List<String> values) {
             addCriterion("sales_week in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotIn(List<String> values) {
+        public Criteria andSalesWeekNotIn(List<Date> values) {
             addCriterion("sales_week not in", values, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekBetween(String value1, String value2) {
+        public Criteria andSalesWeekBetween(Date value1, Date value2) {
             addCriterion("sales_week between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
 
-        public Criteria andSalesWeekNotBetween(String value1, String value2) {
+        public Criteria andSalesWeekNotBetween(Date value1, Date value2) {
             addCriterion("sales_week not between", value1, value2, "salesWeek");
             return (Criteria) this;
         }
@@ -1775,6 +1765,66 @@ public class StockExample {
             addCriterion("stock_warn_count not between", value1, value2, "stockWarnCount");
             return (Criteria) this;
         }
+
+        public Criteria andTailWarnIsNull() {
+            addCriterion("tail_warn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnIsNotNull() {
+            addCriterion("tail_warn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnEqualTo(Integer value) {
+            addCriterion("tail_warn =", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotEqualTo(Integer value) {
+            addCriterion("tail_warn <>", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThan(Integer value) {
+            addCriterion("tail_warn >", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn >=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThan(Integer value) {
+            addCriterion("tail_warn <", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnLessThanOrEqualTo(Integer value) {
+            addCriterion("tail_warn <=", value, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnIn(List<Integer> values) {
+            addCriterion("tail_warn in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotIn(List<Integer> values) {
+            addCriterion("tail_warn not in", values, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn between", value1, value2, "tailWarn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTailWarnNotBetween(Integer value1, Integer value2) {
+            addCriterion("tail_warn not between", value1, value2, "tailWarn");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml

@@ -22,8 +22,9 @@
     <result column="product_picture" jdbcType="VARCHAR" property="productPicture" />
     <result column="product_video" jdbcType="VARCHAR" property="productVideo" />
     <result column="product_intro" jdbcType="VARCHAR" property="productIntro" />
-    <result column="sales_week" jdbcType="VARCHAR" property="salesWeek" />
+    <result column="sales_week" jdbcType="TIMESTAMP" property="salesWeek" />
     <result column="print_barcode" jdbcType="VARCHAR" property="printBarcode" />
+    <result column="tail_warn" jdbcType="INTEGER" property="tailWarn" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -86,7 +87,8 @@
   <sql id="Base_Column_List">
     id, create_by, create_time, del_flag, update_by, update_time, product_name, unit, 
     shop_id, category_id, attribute_list, supplier_id, product_sn, barcode, price, purchase_price, 
-    wholesale_price, product_picture, product_video, product_intro, sales_week, print_barcode
+    wholesale_price, product_picture, product_video, product_intro, sales_week, print_barcode, 
+    tail_warn
   </sql>
   <select id="selectByExample" parameterType="cc.hiver.mall.entity.ProductExample" resultMap="BaseResultMap">
     select
@@ -126,15 +128,15 @@
       product_sn, barcode, price, 
       purchase_price, wholesale_price, product_picture, 
       product_video, product_intro, sales_week, 
-      print_barcode)
+      print_barcode, tail_warn)
     values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{productName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, 
       #{categoryId,jdbcType=VARCHAR}, #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, 
       #{productSn,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, 
       #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, #{productPicture,jdbcType=VARCHAR}, 
-      #{productVideo,jdbcType=VARCHAR}, #{productIntro,jdbcType=VARCHAR}, #{salesWeek,jdbcType=VARCHAR}, 
+      #{productVideo,jdbcType=VARCHAR}, #{productIntro,jdbcType=VARCHAR}, #{salesWeek,jdbcType=TIMESTAMP}, 
-      #{printBarcode,jdbcType=VARCHAR})
+      #{printBarcode,jdbcType=VARCHAR}, #{tailWarn,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cc.hiver.mall.entity.Product">
     insert into t_product
@@ -205,6 +207,9 @@
       <if test="printBarcode != null">
         print_barcode,
       </if>
+      <if test="tailWarn != null">
+        tail_warn,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -268,11 +273,14 @@
         #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        #{salesWeek,jdbcType=VARCHAR},
+        #{salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="printBarcode != null">
         #{printBarcode,jdbcType=VARCHAR},
       </if>
+      <if test="tailWarn != null">
+        #{tailWarn,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="cc.hiver.mall.entity.ProductExample" resultType="java.lang.Long">
@@ -345,11 +353,14 @@
         product_intro = #{record.productIntro,jdbcType=VARCHAR},
       </if>
       <if test="record.salesWeek != null">
-        sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+        sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="record.printBarcode != null">
         print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
       </if>
+      <if test="record.tailWarn != null">
+        tail_warn = #{record.tailWarn,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -377,8 +388,9 @@
       product_picture = #{record.productPicture,jdbcType=VARCHAR},
       product_video = #{record.productVideo,jdbcType=VARCHAR},
       product_intro = #{record.productIntro,jdbcType=VARCHAR},
-      sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+      sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
-      print_barcode = #{record.printBarcode,jdbcType=VARCHAR}
+      print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
+      tail_warn = #{record.tailWarn,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -444,11 +456,14 @@
         product_intro = #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        sales_week = #{salesWeek,jdbcType=VARCHAR},
+        sales_week = #{salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="printBarcode != null">
         print_barcode = #{printBarcode,jdbcType=VARCHAR},
       </if>
+      <if test="tailWarn != null">
+        tail_warn = #{tailWarn,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -473,8 +488,9 @@
       product_picture = #{productPicture,jdbcType=VARCHAR},
       product_video = #{productVideo,jdbcType=VARCHAR},
       product_intro = #{productIntro,jdbcType=VARCHAR},
-      sales_week = #{salesWeek,jdbcType=VARCHAR},
+      sales_week = #{salesWeek,jdbcType=TIMESTAMP},
-      print_barcode = #{printBarcode,jdbcType=VARCHAR}
+      print_barcode = #{printBarcode,jdbcType=VARCHAR},
+      tail_warn = #{tailWarn,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml

@@ -24,7 +24,8 @@
     <result column="product_picture" jdbcType="VARCHAR" property="productPicture" />
     <result column="product_video" jdbcType="VARCHAR" property="productVideo" />
     <result column="product_intro" jdbcType="VARCHAR" property="productIntro" />
-    <result column="sales_week" jdbcType="VARCHAR" property="salesWeek" />
+    <result column="sales_week" jdbcType="TIMESTAMP" property="salesWeek" />
+    <result column="tail_warn" jdbcType="INTEGER" property="tailWarn" />
     <result column="print_barcode" jdbcType="VARCHAR" property="printBarcode" />
     <result column="product_count" jdbcType="INTEGER" property="productCount" />
   </resultMap>
@@ -90,7 +91,7 @@
     id, create_by, create_time, del_flag, update_by, update_time, purchase_id, product_id, 
     product_name, unit, shop_id, category_id, attribute_list, supplier_id, product_sn, 
     barcode, price, purchase_price, wholesale_price, product_picture, product_video, 
-    product_intro, sales_week, print_barcode, product_count
+    product_intro, sales_week, tail_warn, print_barcode, product_count
   </sql>
   <select id="selectByExample" parameterType="cc.hiver.mall.entity.PurchaseDetailExample" resultMap="BaseResultMap">
     select
@@ -130,8 +131,8 @@
       attribute_list, supplier_id, product_sn, 
       barcode, price, purchase_price, 
       wholesale_price, product_picture, product_video, 
-      product_intro, sales_week, print_barcode, 
+      product_intro, sales_week, tail_warn, 
-      product_count)
+      print_barcode, product_count)
     values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{purchaseId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, 
@@ -139,8 +140,8 @@
       #{attributeList,jdbcType=VARCHAR}, #{supplierId,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, 
       #{barcode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, 
       #{wholesalePrice,jdbcType=DECIMAL}, #{productPicture,jdbcType=VARCHAR}, #{productVideo,jdbcType=VARCHAR}, 
-      #{productIntro,jdbcType=VARCHAR}, #{salesWeek,jdbcType=VARCHAR}, #{printBarcode,jdbcType=VARCHAR}, 
+      #{productIntro,jdbcType=VARCHAR}, #{salesWeek,jdbcType=TIMESTAMP}, #{tailWarn,jdbcType=INTEGER}, 
-      #{productCount,jdbcType=INTEGER})
+      #{printBarcode,jdbcType=VARCHAR}, #{productCount,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cc.hiver.mall.entity.PurchaseDetail">
     insert into t_purchase_detail
@@ -214,6 +215,9 @@
       <if test="salesWeek != null">
         sales_week,
       </if>
+      <if test="tailWarn != null">
+        tail_warn,
+      </if>
       <if test="printBarcode != null">
         print_barcode,
       </if>
@@ -289,7 +293,10 @@
         #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        #{salesWeek,jdbcType=VARCHAR},
+        #{salesWeek,jdbcType=TIMESTAMP},
+      </if>
+      <if test="tailWarn != null">
+        #{tailWarn,jdbcType=INTEGER},
       </if>
       <if test="printBarcode != null">
         #{printBarcode,jdbcType=VARCHAR},
@@ -375,7 +382,10 @@
         product_intro = #{record.productIntro,jdbcType=VARCHAR},
       </if>
       <if test="record.salesWeek != null">
-        sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+        sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.tailWarn != null">
+        tail_warn = #{record.tailWarn,jdbcType=INTEGER},
       </if>
       <if test="record.printBarcode != null">
         print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
@@ -412,7 +422,8 @@
       product_picture = #{record.productPicture,jdbcType=VARCHAR},
       product_video = #{record.productVideo,jdbcType=VARCHAR},
       product_intro = #{record.productIntro,jdbcType=VARCHAR},
-      sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+      sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
+      tail_warn = #{record.tailWarn,jdbcType=INTEGER},
       print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
       product_count = #{record.productCount,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -486,7 +497,10 @@
         product_intro = #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        sales_week = #{salesWeek,jdbcType=VARCHAR},
+        sales_week = #{salesWeek,jdbcType=TIMESTAMP},
+      </if>
+      <if test="tailWarn != null">
+        tail_warn = #{tailWarn,jdbcType=INTEGER},
       </if>
       <if test="printBarcode != null">
         print_barcode = #{printBarcode,jdbcType=VARCHAR},
@@ -520,7 +534,8 @@
       product_picture = #{productPicture,jdbcType=VARCHAR},
       product_video = #{productVideo,jdbcType=VARCHAR},
       product_intro = #{productIntro,jdbcType=VARCHAR},
-      sales_week = #{salesWeek,jdbcType=VARCHAR},
+      sales_week = #{salesWeek,jdbcType=TIMESTAMP},
+      tail_warn = #{tailWarn,jdbcType=INTEGER},
       print_barcode = #{printBarcode,jdbcType=VARCHAR},
       product_count = #{productCount,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}

hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml

@@ -23,10 +23,11 @@
     <result column="product_picture" jdbcType="VARCHAR" property="productPicture" />
     <result column="product_video" jdbcType="VARCHAR" property="productVideo" />
     <result column="product_intro" jdbcType="VARCHAR" property="productIntro" />
-    <result column="sales_week" jdbcType="VARCHAR" property="salesWeek" />
+    <result column="sales_week" jdbcType="TIMESTAMP" property="salesWeek" />
     <result column="print_barcode" jdbcType="VARCHAR" property="printBarcode" />
     <result column="stock_count" jdbcType="INTEGER" property="stockCount" />
     <result column="stock_warn_count" jdbcType="INTEGER" property="stockWarnCount" />
+    <result column="tail_warn" jdbcType="INTEGER" property="tailWarn" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -90,7 +91,7 @@
     id, create_by, create_time, del_flag, update_by, update_time, product_id, product_name, 
     unit, shop_id, category_id, attribute_list, supplier_id, product_sn, barcode, price, 
     purchase_price, wholesale_price, product_picture, product_video, product_intro, sales_week, 
-    print_barcode, stock_count, stock_warn_count
+    print_barcode, stock_count, stock_warn_count, tail_warn
   </sql>
   <select id="selectByExample" parameterType="cc.hiver.mall.entity.StockExample" resultMap="BaseResultMap">
     select
@@ -131,7 +132,7 @@
       price, purchase_price, wholesale_price, 
       product_picture, product_video, product_intro, 
       sales_week, print_barcode, stock_count, 
-      stock_warn_count)
+      stock_warn_count, tail_warn)
     values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, 
@@ -139,8 +140,8 @@
       #{supplierId,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, 
       #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, #{wholesalePrice,jdbcType=DECIMAL}, 
       #{productPicture,jdbcType=VARCHAR}, #{productVideo,jdbcType=VARCHAR}, #{productIntro,jdbcType=VARCHAR}, 
-      #{salesWeek,jdbcType=VARCHAR}, #{printBarcode,jdbcType=VARCHAR}, #{stockCount,jdbcType=INTEGER}, 
+      #{salesWeek,jdbcType=TIMESTAMP}, #{printBarcode,jdbcType=VARCHAR}, #{stockCount,jdbcType=INTEGER}, 
-      #{stockWarnCount,jdbcType=INTEGER})
+      #{stockWarnCount,jdbcType=INTEGER}, #{tailWarn,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cc.hiver.mall.entity.Stock">
     insert into t_stock
@@ -220,6 +221,9 @@
       <if test="stockWarnCount != null">
         stock_warn_count,
       </if>
+      <if test="tailWarn != null">
+        tail_warn,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -286,7 +290,7 @@
         #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        #{salesWeek,jdbcType=VARCHAR},
+        #{salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="printBarcode != null">
         #{printBarcode,jdbcType=VARCHAR},
@@ -297,6 +301,9 @@
       <if test="stockWarnCount != null">
         #{stockWarnCount,jdbcType=INTEGER},
       </if>
+      <if test="tailWarn != null">
+        #{tailWarn,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="cc.hiver.mall.entity.StockExample" resultType="java.lang.Long">
@@ -372,7 +379,7 @@
         product_intro = #{record.productIntro,jdbcType=VARCHAR},
       </if>
       <if test="record.salesWeek != null">
-        sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+        sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="record.printBarcode != null">
         print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
@@ -383,6 +390,9 @@
       <if test="record.stockWarnCount != null">
         stock_warn_count = #{record.stockWarnCount,jdbcType=INTEGER},
       </if>
+      <if test="record.tailWarn != null">
+        tail_warn = #{record.tailWarn,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -411,10 +421,11 @@
       product_picture = #{record.productPicture,jdbcType=VARCHAR},
       product_video = #{record.productVideo,jdbcType=VARCHAR},
       product_intro = #{record.productIntro,jdbcType=VARCHAR},
-      sales_week = #{record.salesWeek,jdbcType=VARCHAR},
+      sales_week = #{record.salesWeek,jdbcType=TIMESTAMP},
       print_barcode = #{record.printBarcode,jdbcType=VARCHAR},
       stock_count = #{record.stockCount,jdbcType=INTEGER},
-      stock_warn_count = #{record.stockWarnCount,jdbcType=INTEGER}
+      stock_warn_count = #{record.stockWarnCount,jdbcType=INTEGER},
+      tail_warn = #{record.tailWarn,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -483,7 +494,7 @@
         product_intro = #{productIntro,jdbcType=VARCHAR},
       </if>
       <if test="salesWeek != null">
-        sales_week = #{salesWeek,jdbcType=VARCHAR},
+        sales_week = #{salesWeek,jdbcType=TIMESTAMP},
       </if>
       <if test="printBarcode != null">
         print_barcode = #{printBarcode,jdbcType=VARCHAR},
@@ -494,6 +505,9 @@
       <if test="stockWarnCount != null">
         stock_warn_count = #{stockWarnCount,jdbcType=INTEGER},
       </if>
+      <if test="tailWarn != null">
+        tail_warn = #{tailWarn,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -519,10 +533,11 @@
       product_picture = #{productPicture,jdbcType=VARCHAR},
       product_video = #{productVideo,jdbcType=VARCHAR},
       product_intro = #{productIntro,jdbcType=VARCHAR},
-      sales_week = #{salesWeek,jdbcType=VARCHAR},
+      sales_week = #{salesWeek,jdbcType=TIMESTAMP},
       print_barcode = #{printBarcode,jdbcType=VARCHAR},
       stock_count = #{stockCount,jdbcType=INTEGER},
-      stock_warn_count = #{stockWarnCount,jdbcType=INTEGER}
+      stock_warn_count = #{stockWarnCount,jdbcType=INTEGER},
+      tail_warn = #{tailWarn,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>