限时购库表修改

mall-mbg/src/main/java/com/macro/mall/mapper/SmsFlashPromotionMapper.java

@@ -10,7 +10,7 @@ public interface SmsFlashPromotionMapper {
 
     int deleteByExample(SmsFlashPromotionExample example);
 
-    int deleteByPrimaryKey(Integer id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(SmsFlashPromotion record);
 
@@ -18,7 +18,7 @@ public interface SmsFlashPromotionMapper {
 
     List<SmsFlashPromotion> selectByExample(SmsFlashPromotionExample example);
 
-    SmsFlashPromotion selectByPrimaryKey(Integer id);
+    SmsFlashPromotion selectByPrimaryKey(Long id);
 
     int updateByExampleSelective(@Param("record") SmsFlashPromotion record, @Param("example") SmsFlashPromotionExample example);
 

mall-mbg/src/main/java/com/macro/mall/mapper/SmsFlashPromotionProductRelationMapper.java

+package com.macro.mall.mapper;
+
+import com.macro.mall.model.SmsFlashPromotionProductRelation;
+import com.macro.mall.model.SmsFlashPromotionProductRelationExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SmsFlashPromotionProductRelationMapper {
+    int countByExample(SmsFlashPromotionProductRelationExample example);
+
+    int deleteByExample(SmsFlashPromotionProductRelationExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SmsFlashPromotionProductRelation record);
+
+    int insertSelective(SmsFlashPromotionProductRelation record);
+
+    List<SmsFlashPromotionProductRelation> selectByExample(SmsFlashPromotionProductRelationExample example);
+
+    SmsFlashPromotionProductRelation selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") SmsFlashPromotionProductRelation record, @Param("example") SmsFlashPromotionProductRelationExample example);
+
+    int updateByExample(@Param("record") SmsFlashPromotionProductRelation record, @Param("example") SmsFlashPromotionProductRelationExample example);
+
+    int updateByPrimaryKeySelective(SmsFlashPromotionProductRelation record);
+
+    int updateByPrimaryKey(SmsFlashPromotionProductRelation record);
+}
\ No newline at end of file

mall-mbg/src/main/java/com/macro/mall/mapper/SmsFlashPromotionSessionMapper.java

+package com.macro.mall.mapper;
+
+import com.macro.mall.model.SmsFlashPromotionSession;
+import com.macro.mall.model.SmsFlashPromotionSessionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SmsFlashPromotionSessionMapper {
+    int countByExample(SmsFlashPromotionSessionExample example);
+
+    int deleteByExample(SmsFlashPromotionSessionExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SmsFlashPromotionSession record);
+
+    int insertSelective(SmsFlashPromotionSession record);
+
+    List<SmsFlashPromotionSession> selectByExample(SmsFlashPromotionSessionExample example);
+
+    SmsFlashPromotionSession selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") SmsFlashPromotionSession record, @Param("example") SmsFlashPromotionSessionExample example);
+
+    int updateByExample(@Param("record") SmsFlashPromotionSession record, @Param("example") SmsFlashPromotionSessionExample example);
+
+    int updateByPrimaryKeySelective(SmsFlashPromotionSession record);
+
+    int updateByPrimaryKey(SmsFlashPromotionSession record);
+}
\ No newline at end of file

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

@@ -15,13 +15,6 @@ public class PmsProduct implements Serializable {
 
     private Long productAttributeCategoryId;
 
-    /**
-     * 限时购id
-     *
-     * @mbggenerated
-     */
-    private Integer flashPromotionId;
-
     private String name;
 
     private String pic;
@@ -181,27 +174,6 @@ public class PmsProduct implements Serializable {
 
     private String detailTitle;
 
-    /**
-     * 限时购价格
-     *
-     * @mbggenerated
-     */
-    private BigDecimal flashPromotionPrice;
-
-    /**
-     * 限时购数量
-     *
-     * @mbggenerated
-     */
-    private Integer flashPromotionCount;
-
-    /**
-     * 限时购排序
-     *
-     * @mbggenerated
-     */
-    private Integer flashPromotionSort;
-
     /**
      * 促销开始时间
      *
@@ -224,7 +196,7 @@ public class PmsProduct implements Serializable {
     private Integer promotionPerLimit;
 
     /**
-     * 促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格
+     * 促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购
      *
      * @mbggenerated
      */
@@ -309,14 +281,6 @@ public class PmsProduct implements Serializable {
         this.productAttributeCategoryId = productAttributeCategoryId;
     }
 
-    public Integer getFlashPromotionId() {
-        return flashPromotionId;
-    }
-
-    public void setFlashPromotionId(Integer flashPromotionId) {
-        this.flashPromotionId = flashPromotionId;
-    }
-
     public String getName() {
         return name;
     }
@@ -533,30 +497,6 @@ public class PmsProduct implements Serializable {
         this.detailTitle = detailTitle;
     }
 
-    public BigDecimal getFlashPromotionPrice() {
-        return flashPromotionPrice;
-    }
-
-    public void setFlashPromotionPrice(BigDecimal flashPromotionPrice) {
-        this.flashPromotionPrice = flashPromotionPrice;
-    }
-
-    public Integer getFlashPromotionCount() {
-        return flashPromotionCount;
-    }
-
-    public void setFlashPromotionCount(Integer flashPromotionCount) {
-        this.flashPromotionCount = flashPromotionCount;
-    }
-
-    public Integer getFlashPromotionSort() {
-        return flashPromotionSort;
-    }
-
-    public void setFlashPromotionSort(Integer flashPromotionSort) {
-        this.flashPromotionSort = flashPromotionSort;
-    }
-
     public Date getPromotionStartTime() {
         return promotionStartTime;
     }
@@ -648,7 +588,6 @@ public class PmsProduct implements Serializable {
         sb.append(", productCategoryId=").append(productCategoryId);
         sb.append(", feightTemplateId=").append(feightTemplateId);
         sb.append(", productAttributeCategoryId=").append(productAttributeCategoryId);
-        sb.append(", flashPromotionId=").append(flashPromotionId);
         sb.append(", name=").append(name);
         sb.append(", pic=").append(pic);
         sb.append(", productSn=").append(productSn);
@@ -676,9 +615,6 @@ public class PmsProduct implements Serializable {
         sb.append(", note=").append(note);
         sb.append(", albumPics=").append(albumPics);
         sb.append(", detailTitle=").append(detailTitle);
-        sb.append(", flashPromotionPrice=").append(flashPromotionPrice);
-        sb.append(", flashPromotionCount=").append(flashPromotionCount);
-        sb.append(", flashPromotionSort=").append(flashPromotionSort);
         sb.append(", promotionStartTime=").append(promotionStartTime);
         sb.append(", promotionEndTime=").append(promotionEndTime);
         sb.append(", promotionPerLimit=").append(promotionPerLimit);

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

@@ -406,66 +406,6 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andFlashPromotionIdIsNull() {
-            addCriterion("flash_promotion_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdIsNotNull() {
-            addCriterion("flash_promotion_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdEqualTo(Integer value) {
-            addCriterion("flash_promotion_id =", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdNotEqualTo(Integer value) {
-            addCriterion("flash_promotion_id <>", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdGreaterThan(Integer value) {
-            addCriterion("flash_promotion_id >", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_id >=", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdLessThan(Integer value) {
-            addCriterion("flash_promotion_id <", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdLessThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_id <=", value, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdIn(List<Integer> values) {
-            addCriterion("flash_promotion_id in", values, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdNotIn(List<Integer> values) {
-            addCriterion("flash_promotion_id not in", values, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_id between", value1, value2, "flashPromotionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_id not between", value1, value2, "flashPromotionId");
-            return (Criteria) this;
-        }
-
         public Criteria andNameIsNull() {
             addCriterion("name is null");
             return (Criteria) this;
@@ -2186,186 +2126,6 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andFlashPromotionPriceIsNull() {
-            addCriterion("flash_promotion_price is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceIsNotNull() {
-            addCriterion("flash_promotion_price is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceEqualTo(BigDecimal value) {
-            addCriterion("flash_promotion_price =", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceNotEqualTo(BigDecimal value) {
-            addCriterion("flash_promotion_price <>", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceGreaterThan(BigDecimal value) {
-            addCriterion("flash_promotion_price >", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("flash_promotion_price >=", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceLessThan(BigDecimal value) {
-            addCriterion("flash_promotion_price <", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("flash_promotion_price <=", value, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceIn(List<BigDecimal> values) {
-            addCriterion("flash_promotion_price in", values, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceNotIn(List<BigDecimal> values) {
-            addCriterion("flash_promotion_price not in", values, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("flash_promotion_price between", value1, value2, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionPriceNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("flash_promotion_price not between", value1, value2, "flashPromotionPrice");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountIsNull() {
-            addCriterion("flash_promotion_count is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountIsNotNull() {
-            addCriterion("flash_promotion_count is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountEqualTo(Integer value) {
-            addCriterion("flash_promotion_count =", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountNotEqualTo(Integer value) {
-            addCriterion("flash_promotion_count <>", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountGreaterThan(Integer value) {
-            addCriterion("flash_promotion_count >", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountGreaterThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_count >=", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountLessThan(Integer value) {
-            addCriterion("flash_promotion_count <", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountLessThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_count <=", value, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountIn(List<Integer> values) {
-            addCriterion("flash_promotion_count in", values, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountNotIn(List<Integer> values) {
-            addCriterion("flash_promotion_count not in", values, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_count between", value1, value2, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionCountNotBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_count not between", value1, value2, "flashPromotionCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortIsNull() {
-            addCriterion("flash_promotion_sort is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortIsNotNull() {
-            addCriterion("flash_promotion_sort is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortEqualTo(Integer value) {
-            addCriterion("flash_promotion_sort =", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortNotEqualTo(Integer value) {
-            addCriterion("flash_promotion_sort <>", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortGreaterThan(Integer value) {
-            addCriterion("flash_promotion_sort >", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortGreaterThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_sort >=", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortLessThan(Integer value) {
-            addCriterion("flash_promotion_sort <", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortLessThanOrEqualTo(Integer value) {
-            addCriterion("flash_promotion_sort <=", value, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortIn(List<Integer> values) {
-            addCriterion("flash_promotion_sort in", values, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortNotIn(List<Integer> values) {
-            addCriterion("flash_promotion_sort not in", values, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_sort between", value1, value2, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
-        public Criteria andFlashPromotionSortNotBetween(Integer value1, Integer value2) {
-            addCriterion("flash_promotion_sort not between", value1, value2, "flashPromotionSort");
-            return (Criteria) this;
-        }
-
         public Criteria andPromotionStartTimeIsNull() {
             addCriterion("promotion_start_time is null");
             return (Criteria) this;

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

@@ -4,23 +4,23 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class SmsFlashPromotion implements Serializable {
-    private Integer id;
+    private Long id;
 
     private String title;
 
     /**
-     * 开始时间
+     * 开始日期
      *
      * @mbggenerated
      */
-    private Date startTime;
+    private Date startDate;
 
     /**
-     * 结束时间
+     * 结束日期
      *
      * @mbggenerated
      */
-    private Date endTime;
+    private Date endDate;
 
     /**
      * 上下线状态
@@ -34,15 +34,15 @@ public class SmsFlashPromotion implements Serializable {
      *
      * @mbggenerated
      */
-    private String timeName;
+    private Date createTime;
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -54,20 +54,20 @@ public class SmsFlashPromotion implements Serializable {
         this.title = title;
     }
 
-    public Date getStartTime() {
-        return startTime;
+    public Date getStartDate() {
+        return startDate;
     }
 
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
     }
 
-    public Date getEndTime() {
-        return endTime;
+    public Date getEndDate() {
+        return endDate;
     }
 
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
     }
 
     public Integer getStatus() {
@@ -78,12 +78,12 @@ public class SmsFlashPromotion implements Serializable {
         this.status = status;
     }
 
-    public String getTimeName() {
-        return timeName;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setTimeName(String timeName) {
-        this.timeName = timeName;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     @Override
@@ -94,10 +94,10 @@ public class SmsFlashPromotion implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", title=").append(title);
-        sb.append(", startTime=").append(startTime);
-        sb.append(", endTime=").append(endTime);
+        sb.append(", startDate=").append(startDate);
+        sb.append(", endDate=").append(endDate);
         sb.append(", status=").append(status);
-        sb.append(", timeName=").append(timeName);
+        sb.append(", createTime=").append(createTime);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -2,6 +2,7 @@ package com.macro.mall.model;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 public class SmsFlashPromotionExample {
@@ -105,6 +106,32 @@ public class SmsFlashPromotionExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                dateList.add(new java.sql.Date(iter.next().getTime()));
+            }
+            addCriterion(condition, dateList, property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
+        }
+
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;
@@ -115,52 +142,52 @@ public class SmsFlashPromotionExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(Long value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(Long value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(Long value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(Long value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(Long value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<Long> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<Long> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(Long value1, Long value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(Long value1, Long value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
@@ -235,123 +262,123 @@ public class SmsFlashPromotionExample {
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeIsNull() {
-            addCriterion("start_time is null");
+        public Criteria andStartDateIsNull() {
+            addCriterion("start_date is null");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeIsNotNull() {
-            addCriterion("start_time is not null");
+        public Criteria andStartDateIsNotNull() {
+            addCriterion("start_date is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeEqualTo(Date value) {
-            addCriterion("start_time =", value, "startTime");
+        public Criteria andStartDateEqualTo(Date value) {
+            addCriterionForJDBCDate("start_date =", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeNotEqualTo(Date value) {
-            addCriterion("start_time <>", value, "startTime");
+        public Criteria andStartDateNotEqualTo(Date value) {
+            addCriterionForJDBCDate("start_date <>", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeGreaterThan(Date value) {
-            addCriterion("start_time >", value, "startTime");
+        public Criteria andStartDateGreaterThan(Date value) {
+            addCriterionForJDBCDate("start_date >", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("start_time >=", value, "startTime");
+        public Criteria andStartDateGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("start_date >=", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeLessThan(Date value) {
-            addCriterion("start_time <", value, "startTime");
+        public Criteria andStartDateLessThan(Date value) {
+            addCriterionForJDBCDate("start_date <", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeLessThanOrEqualTo(Date value) {
-            addCriterion("start_time <=", value, "startTime");
+        public Criteria andStartDateLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("start_date <=", value, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeIn(List<Date> values) {
-            addCriterion("start_time in", values, "startTime");
+        public Criteria andStartDateIn(List<Date> values) {
+            addCriterionForJDBCDate("start_date in", values, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeNotIn(List<Date> values) {
-            addCriterion("start_time not in", values, "startTime");
+        public Criteria andStartDateNotIn(List<Date> values) {
+            addCriterionForJDBCDate("start_date not in", values, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeBetween(Date value1, Date value2) {
-            addCriterion("start_time between", value1, value2, "startTime");
+        public Criteria andStartDateBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("start_date between", value1, value2, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andStartTimeNotBetween(Date value1, Date value2) {
-            addCriterion("start_time not between", value1, value2, "startTime");
+        public Criteria andStartDateNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("start_date not between", value1, value2, "startDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeIsNull() {
-            addCriterion("end_time is null");
+        public Criteria andEndDateIsNull() {
+            addCriterion("end_date is null");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeIsNotNull() {
-            addCriterion("end_time is not null");
+        public Criteria andEndDateIsNotNull() {
+            addCriterion("end_date is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeEqualTo(Date value) {
-            addCriterion("end_time =", value, "endTime");
+        public Criteria andEndDateEqualTo(Date value) {
+            addCriterionForJDBCDate("end_date =", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeNotEqualTo(Date value) {
-            addCriterion("end_time <>", value, "endTime");
+        public Criteria andEndDateNotEqualTo(Date value) {
+            addCriterionForJDBCDate("end_date <>", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeGreaterThan(Date value) {
-            addCriterion("end_time >", value, "endTime");
+        public Criteria andEndDateGreaterThan(Date value) {
+            addCriterionForJDBCDate("end_date >", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("end_time >=", value, "endTime");
+        public Criteria andEndDateGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("end_date >=", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeLessThan(Date value) {
-            addCriterion("end_time <", value, "endTime");
+        public Criteria andEndDateLessThan(Date value) {
+            addCriterionForJDBCDate("end_date <", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeLessThanOrEqualTo(Date value) {
-            addCriterion("end_time <=", value, "endTime");
+        public Criteria andEndDateLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("end_date <=", value, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeIn(List<Date> values) {
-            addCriterion("end_time in", values, "endTime");
+        public Criteria andEndDateIn(List<Date> values) {
+            addCriterionForJDBCDate("end_date in", values, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeNotIn(List<Date> values) {
-            addCriterion("end_time not in", values, "endTime");
+        public Criteria andEndDateNotIn(List<Date> values) {
+            addCriterionForJDBCDate("end_date not in", values, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeBetween(Date value1, Date value2) {
-            addCriterion("end_time between", value1, value2, "endTime");
+        public Criteria andEndDateBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("end_date between", value1, value2, "endDate");
             return (Criteria) this;
         }
 
-        public Criteria andEndTimeNotBetween(Date value1, Date value2) {
-            addCriterion("end_time not between", value1, value2, "endTime");
+        public Criteria andEndDateNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("end_date not between", value1, value2, "endDate");
             return (Criteria) this;
         }
 
@@ -415,73 +442,63 @@ public class SmsFlashPromotionExample {
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameIsNull() {
-            addCriterion("time_name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTimeNameIsNotNull() {
-            addCriterion("time_name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTimeNameEqualTo(String value) {
-            addCriterion("time_name =", value, "timeName");
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameNotEqualTo(String value) {
-            addCriterion("time_name <>", value, "timeName");
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameGreaterThan(String value) {
-            addCriterion("time_name >", value, "timeName");
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameGreaterThanOrEqualTo(String value) {
-            addCriterion("time_name >=", value, "timeName");
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameLessThan(String value) {
-            addCriterion("time_name <", value, "timeName");
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameLessThanOrEqualTo(String value) {
-            addCriterion("time_name <=", value, "timeName");
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameLike(String value) {
-            addCriterion("time_name like", value, "timeName");
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameNotLike(String value) {
-            addCriterion("time_name not like", value, "timeName");
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameIn(List<String> values) {
-            addCriterion("time_name in", values, "timeName");
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameNotIn(List<String> values) {
-            addCriterion("time_name not in", values, "timeName");
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameBetween(String value1, String value2) {
-            addCriterion("time_name between", value1, value2, "timeName");
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andTimeNameNotBetween(String value1, String value2) {
-            addCriterion("time_name not between", value1, value2, "timeName");
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
             return (Criteria) this;
         }
     }

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

+package com.macro.mall.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class SmsFlashPromotionProductRelation implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
+    private Long id;
+
+    private Long flashPromotionId;
+
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
+    private Long flashPromotionSessionId;
+
+    private Long productId;
+
+    /**
+     * 限时购价格
+     *
+     * @mbggenerated
+     */
+    private BigDecimal flashPromotionPrice;
+
+    /**
+     * 限时购数量
+     *
+     * @mbggenerated
+     */
+    private Integer flashPromotionCount;
+
+    /**
+     * 每人限购数量
+     *
+     * @mbggenerated
+     */
+    private Integer flashPromotionLimit;
+
+    /**
+     * 排序
+     *
+     * @mbggenerated
+     */
+    private Integer sort;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFlashPromotionId() {
+        return flashPromotionId;
+    }
+
+    public void setFlashPromotionId(Long flashPromotionId) {
+        this.flashPromotionId = flashPromotionId;
+    }
+
+    public Long getFlashPromotionSessionId() {
+        return flashPromotionSessionId;
+    }
+
+    public void setFlashPromotionSessionId(Long flashPromotionSessionId) {
+        this.flashPromotionSessionId = flashPromotionSessionId;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public BigDecimal getFlashPromotionPrice() {
+        return flashPromotionPrice;
+    }
+
+    public void setFlashPromotionPrice(BigDecimal flashPromotionPrice) {
+        this.flashPromotionPrice = flashPromotionPrice;
+    }
+
+    public Integer getFlashPromotionCount() {
+        return flashPromotionCount;
+    }
+
+    public void setFlashPromotionCount(Integer flashPromotionCount) {
+        this.flashPromotionCount = flashPromotionCount;
+    }
+
+    public Integer getFlashPromotionLimit() {
+        return flashPromotionLimit;
+    }
+
+    public void setFlashPromotionLimit(Integer flashPromotionLimit) {
+        this.flashPromotionLimit = flashPromotionLimit;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", flashPromotionId=").append(flashPromotionId);
+        sb.append(", flashPromotionSessionId=").append(flashPromotionSessionId);
+        sb.append(", productId=").append(productId);
+        sb.append(", flashPromotionPrice=").append(flashPromotionPrice);
+        sb.append(", flashPromotionCount=").append(flashPromotionCount);
+        sb.append(", flashPromotionLimit=").append(flashPromotionLimit);
+        sb.append(", sort=").append(sort);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

+package com.macro.mall.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SmsFlashPromotionSession implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
+    private Long id;
+
+    /**
+     * 场次名称
+     *
+     * @mbggenerated
+     */
+    private String name;
+
+    /**
+     * 每日开始时间
+     *
+     * @mbggenerated
+     */
+    private Date startTime;
+
+    /**
+     * 每日结束时间
+     *
+     * @mbggenerated
+     */
+    private Date endTime;
+
+    /**
+     * 启用状态：0->不启用；1->启用
+     *
+     * @mbggenerated
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     *
+     * @mbggenerated
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

+package com.macro.mall.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public class SmsFlashPromotionSessionExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public SmsFlashPromotionSessionExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        protected void addCriterionForJDBCTime(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Time(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCTime(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Time> timeList = new ArrayList<java.sql.Time>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                timeList.add(new java.sql.Time(iter.next().getTime()));
+            }
+            addCriterion(condition, timeList, property);
+        }
+
+        protected void addCriterionForJDBCTime(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Time(value1.getTime()), new java.sql.Time(value2.getTime()), property);
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNull() {
+            addCriterion("start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNotNull() {
+            addCriterion("start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeEqualTo(Date value) {
+            addCriterionForJDBCTime("start_time =", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotEqualTo(Date value) {
+            addCriterionForJDBCTime("start_time <>", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThan(Date value) {
+            addCriterionForJDBCTime("start_time >", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCTime("start_time >=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThan(Date value) {
+            addCriterionForJDBCTime("start_time <", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCTime("start_time <=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIn(List<Date> values) {
+            addCriterionForJDBCTime("start_time in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotIn(List<Date> values) {
+            addCriterionForJDBCTime("start_time not in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeBetween(Date value1, Date value2) {
+            addCriterionForJDBCTime("start_time between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCTime("start_time not between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Date value) {
+            addCriterionForJDBCTime("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Date value) {
+            addCriterionForJDBCTime("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Date value) {
+            addCriterionForJDBCTime("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCTime("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Date value) {
+            addCriterionForJDBCTime("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCTime("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Date> values) {
+            addCriterionForJDBCTime("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Date> values) {
+            addCriterionForJDBCTime("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Date value1, Date value2) {
+            addCriterionForJDBCTime("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCTime("end_time not between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml

@@ -7,7 +7,6 @@
     <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
     <result column="feight_template_id" jdbcType="BIGINT" property="feightTemplateId" />
     <result column="product_attribute_category_id" jdbcType="BIGINT" property="productAttributeCategoryId" />
-    <result column="flash_promotion_id" jdbcType="INTEGER" property="flashPromotionId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="pic" jdbcType="VARCHAR" property="pic" />
     <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
@@ -35,9 +34,6 @@
     <result column="note" jdbcType="VARCHAR" property="note" />
     <result column="album_pics" jdbcType="VARCHAR" property="albumPics" />
     <result column="detail_title" jdbcType="VARCHAR" property="detailTitle" />
-    <result column="flash_promotion_price" jdbcType="DECIMAL" property="flashPromotionPrice" />
-    <result column="flash_promotion_count" jdbcType="INTEGER" property="flashPromotionCount" />
-    <result column="flash_promotion_sort" jdbcType="INTEGER" property="flashPromotionSort" />
     <result column="promotion_start_time" jdbcType="TIMESTAMP" property="promotionStartTime" />
     <result column="promotion_end_time" jdbcType="TIMESTAMP" property="promotionEndTime" />
     <result column="promotion_per_limit" jdbcType="INTEGER" property="promotionPerLimit" />
@@ -111,11 +107,10 @@
   </sql>
   <sql id="Base_Column_List">
     id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, 
-    flash_promotion_id, name, pic, product_sn, delete_status, publish_status, new_status, 
-    recommand_status, verify_status, sort, sale, price, promotion_price, gift_growth, 
-    gift_point, use_point_limit, sub_title, original_price, stock, low_stock, unit, weight, 
-    preview_status, service_ids, keywords, note, album_pics, detail_title, flash_promotion_price, 
-    flash_promotion_count, flash_promotion_sort, promotion_start_time, promotion_end_time, 
+    name, pic, product_sn, delete_status, publish_status, new_status, recommand_status, 
+    verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
+    sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
+    keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
     promotion_per_limit, promotion_type, brand_name, product_category_name
   </sql>
   <sql id="Blob_Column_List">
@@ -174,39 +169,33 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into pms_product (brand_id, product_category_id, feight_template_id, 
-      product_attribute_category_id, flash_promotion_id, 
-      name, pic, product_sn, 
-      delete_status, publish_status, new_status, 
-      recommand_status, verify_status, sort, 
-      sale, price, promotion_price, 
-      gift_growth, gift_point, use_point_limit, 
-      sub_title, original_price, stock, 
-      low_stock, unit, weight, 
-      preview_status, service_ids, keywords, 
-      note, album_pics, detail_title, 
-      flash_promotion_price, flash_promotion_count, 
-      flash_promotion_sort, promotion_start_time, 
-      promotion_end_time, promotion_per_limit, 
-      promotion_type, brand_name, product_category_name, 
-      description, detail_desc, detail_html, 
-      detail_mobile_html)
+      product_attribute_category_id, name, pic, 
+      product_sn, delete_status, publish_status, 
+      new_status, recommand_status, verify_status, 
+      sort, sale, price, 
+      promotion_price, gift_growth, gift_point, 
+      use_point_limit, sub_title, original_price, 
+      stock, low_stock, unit, 
+      weight, preview_status, service_ids, 
+      keywords, note, album_pics, 
+      detail_title, promotion_start_time, promotion_end_time, 
+      promotion_per_limit, promotion_type, brand_name, 
+      product_category_name, description, detail_desc, 
+      detail_html, detail_mobile_html)
     values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, 
-      #{productAttributeCategoryId,jdbcType=BIGINT}, #{flashPromotionId,jdbcType=INTEGER}, 
-      #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, 
-      #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER}, 
-      #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
-      #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL}, 
-      #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, #{usePointLimit,jdbcType=INTEGER}, 
-      #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, 
-      #{lowStock,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, 
-      #{previewStatus,jdbcType=INTEGER}, #{serviceIds,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, 
-      #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, #{detailTitle,jdbcType=VARCHAR}, 
-      #{flashPromotionPrice,jdbcType=DECIMAL}, #{flashPromotionCount,jdbcType=INTEGER}, 
-      #{flashPromotionSort,jdbcType=INTEGER}, #{promotionStartTime,jdbcType=TIMESTAMP}, 
-      #{promotionEndTime,jdbcType=TIMESTAMP}, #{promotionPerLimit,jdbcType=INTEGER}, 
-      #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, #{productCategoryName,jdbcType=VARCHAR}, 
-      #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR}, 
-      #{detailMobileHtml,jdbcType=LONGVARCHAR})
+      #{productAttributeCategoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
+      #{productSn,jdbcType=VARCHAR}, #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, 
+      #{newStatus,jdbcType=INTEGER}, #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, 
+      #{sort,jdbcType=INTEGER}, #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, 
+      #{promotionPrice,jdbcType=DECIMAL}, #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, 
+      #{usePointLimit,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, 
+      #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, 
+      #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, #{serviceIds,jdbcType=VARCHAR}, 
+      #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, 
+      #{detailTitle,jdbcType=VARCHAR}, #{promotionStartTime,jdbcType=TIMESTAMP}, #{promotionEndTime,jdbcType=TIMESTAMP}, 
+      #{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, 
+      #{productCategoryName,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, 
+      #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.PmsProduct">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -226,9 +215,6 @@
       <if test="productAttributeCategoryId != null">
         product_attribute_category_id,
       </if>
-      <if test="flashPromotionId != null">
-        flash_promotion_id,
-      </if>
       <if test="name != null">
         name,
       </if>
@@ -310,15 +296,6 @@
       <if test="detailTitle != null">
         detail_title,
       </if>
-      <if test="flashPromotionPrice != null">
-        flash_promotion_price,
-      </if>
-      <if test="flashPromotionCount != null">
-        flash_promotion_count,
-      </if>
-      <if test="flashPromotionSort != null">
-        flash_promotion_sort,
-      </if>
       <if test="promotionStartTime != null">
         promotion_start_time,
       </if>
@@ -363,9 +340,6 @@
       <if test="productAttributeCategoryId != null">
         #{productAttributeCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="flashPromotionId != null">
-        #{flashPromotionId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
@@ -447,15 +421,6 @@
       <if test="detailTitle != null">
         #{detailTitle,jdbcType=VARCHAR},
       </if>
-      <if test="flashPromotionPrice != null">
-        #{flashPromotionPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="flashPromotionCount != null">
-        #{flashPromotionCount,jdbcType=INTEGER},
-      </if>
-      <if test="flashPromotionSort != null">
-        #{flashPromotionSort,jdbcType=INTEGER},
-      </if>
       <if test="promotionStartTime != null">
         #{promotionStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -512,9 +477,6 @@
       <if test="record.productAttributeCategoryId != null">
         product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="record.flashPromotionId != null">
-        flash_promotion_id = #{record.flashPromotionId,jdbcType=INTEGER},
-      </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
@@ -596,15 +558,6 @@
       <if test="record.detailTitle != null">
         detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       </if>
-      <if test="record.flashPromotionPrice != null">
-        flash_promotion_price = #{record.flashPromotionPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.flashPromotionCount != null">
-        flash_promotion_count = #{record.flashPromotionCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.flashPromotionSort != null">
-        flash_promotion_sort = #{record.flashPromotionSort,jdbcType=INTEGER},
-      </if>
       <if test="record.promotionStartTime != null">
         promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -647,7 +600,6 @@
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
-      flash_promotion_id = #{record.flashPromotionId,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
       pic = #{record.pic,jdbcType=VARCHAR},
       product_sn = #{record.productSn,jdbcType=VARCHAR},
@@ -675,9 +627,6 @@
       note = #{record.note,jdbcType=VARCHAR},
       album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
-      flash_promotion_price = #{record.flashPromotionPrice,jdbcType=DECIMAL},
-      flash_promotion_count = #{record.flashPromotionCount,jdbcType=INTEGER},
-      flash_promotion_sort = #{record.flashPromotionSort,jdbcType=INTEGER},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
@@ -699,7 +648,6 @@
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
-      flash_promotion_id = #{record.flashPromotionId,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
       pic = #{record.pic,jdbcType=VARCHAR},
       product_sn = #{record.productSn,jdbcType=VARCHAR},
@@ -727,9 +675,6 @@
       note = #{record.note,jdbcType=VARCHAR},
       album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
-      flash_promotion_price = #{record.flashPromotionPrice,jdbcType=DECIMAL},
-      flash_promotion_count = #{record.flashPromotionCount,jdbcType=INTEGER},
-      flash_promotion_sort = #{record.flashPromotionSort,jdbcType=INTEGER},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
@@ -755,9 +700,6 @@
       <if test="productAttributeCategoryId != null">
         product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="flashPromotionId != null">
-        flash_promotion_id = #{flashPromotionId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
@@ -839,15 +781,6 @@
       <if test="detailTitle != null">
         detail_title = #{detailTitle,jdbcType=VARCHAR},
       </if>
-      <if test="flashPromotionPrice != null">
-        flash_promotion_price = #{flashPromotionPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="flashPromotionCount != null">
-        flash_promotion_count = #{flashPromotionCount,jdbcType=INTEGER},
-      </if>
-      <if test="flashPromotionSort != null">
-        flash_promotion_sort = #{flashPromotionSort,jdbcType=INTEGER},
-      </if>
       <if test="promotionStartTime != null">
         promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -887,7 +820,6 @@
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
-      flash_promotion_id = #{flashPromotionId,jdbcType=INTEGER},
       name = #{name,jdbcType=VARCHAR},
       pic = #{pic,jdbcType=VARCHAR},
       product_sn = #{productSn,jdbcType=VARCHAR},
@@ -915,9 +847,6 @@
       note = #{note,jdbcType=VARCHAR},
       album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
-      flash_promotion_price = #{flashPromotionPrice,jdbcType=DECIMAL},
-      flash_promotion_count = #{flashPromotionCount,jdbcType=INTEGER},
-      flash_promotion_sort = #{flashPromotionSort,jdbcType=INTEGER},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
@@ -936,7 +865,6 @@
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
-      flash_promotion_id = #{flashPromotionId,jdbcType=INTEGER},
       name = #{name,jdbcType=VARCHAR},
       pic = #{pic,jdbcType=VARCHAR},
       product_sn = #{productSn,jdbcType=VARCHAR},
@@ -964,9 +892,6 @@
       note = #{note,jdbcType=VARCHAR},
       album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
-      flash_promotion_price = #{flashPromotionPrice,jdbcType=DECIMAL},
-      flash_promotion_count = #{flashPromotionCount,jdbcType=INTEGER},
-      flash_promotion_sort = #{flashPromotionSort,jdbcType=INTEGER},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.macro.mall.mapper.SmsFlashPromotionMapper">
   <resultMap id="BaseResultMap" type="com.macro.mall.model.SmsFlashPromotion">
-    <id column="id" jdbcType="INTEGER" property="id" />
+    <id column="id" jdbcType="BIGINT" property="id" />
     <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
-    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="start_date" jdbcType="DATE" property="startDate" />
+    <result column="end_date" jdbcType="DATE" property="endDate" />
     <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="time_name" jdbcType="VARCHAR" property="timeName" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -68,7 +68,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, title, start_time, end_time, status, time_name
+    id, title, start_date, end_date, status, create_time
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.SmsFlashPromotionExample" resultMap="BaseResultMap">
     select
@@ -84,15 +84,15 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from sms_flash_promotion
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from sms_flash_promotion
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </delete>
   <delete id="deleteByExample" parameterType="com.macro.mall.model.SmsFlashPromotionExample">
     delete from sms_flash_promotion
@@ -101,16 +101,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.macro.mall.model.SmsFlashPromotion">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into sms_flash_promotion (title, start_time, end_time, 
-      status, time_name)
-    values (#{title,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{timeName,jdbcType=VARCHAR})
+    insert into sms_flash_promotion (title, start_date, end_date, 
+      status, create_time)
+    values (#{title,jdbcType=VARCHAR}, #{startDate,jdbcType=DATE}, #{endDate,jdbcType=DATE}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.SmsFlashPromotion">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into sms_flash_promotion
@@ -118,34 +118,34 @@
       <if test="title != null">
         title,
       </if>
-      <if test="startTime != null">
-        start_time,
+      <if test="startDate != null">
+        start_date,
       </if>
-      <if test="endTime != null">
-        end_time,
+      <if test="endDate != null">
+        end_date,
       </if>
       <if test="status != null">
         status,
       </if>
-      <if test="timeName != null">
-        time_name,
+      <if test="createTime != null">
+        create_time,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
-      <if test="startTime != null">
-        #{startTime,jdbcType=TIMESTAMP},
+      <if test="startDate != null">
+        #{startDate,jdbcType=DATE},
       </if>
-      <if test="endTime != null">
-        #{endTime,jdbcType=TIMESTAMP},
+      <if test="endDate != null">
+        #{endDate,jdbcType=DATE},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
-      <if test="timeName != null">
-        #{timeName,jdbcType=VARCHAR},
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
@@ -159,22 +159,22 @@
     update sms_flash_promotion
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
+        id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
       </if>
-      <if test="record.startTime != null">
-        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      <if test="record.startDate != null">
+        start_date = #{record.startDate,jdbcType=DATE},
       </if>
-      <if test="record.endTime != null">
-        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      <if test="record.endDate != null">
+        end_date = #{record.endDate,jdbcType=DATE},
       </if>
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
-      <if test="record.timeName != null">
-        time_name = #{record.timeName,jdbcType=VARCHAR},
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
     </set>
     <if test="_parameter != null">
@@ -183,12 +183,12 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update sms_flash_promotion
-    set id = #{record.id,jdbcType=INTEGER},
+    set id = #{record.id,jdbcType=BIGINT},
       title = #{record.title,jdbcType=VARCHAR},
-      start_time = #{record.startTime,jdbcType=TIMESTAMP},
-      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      start_date = #{record.startDate,jdbcType=DATE},
+      end_date = #{record.endDate,jdbcType=DATE},
       status = #{record.status,jdbcType=INTEGER},
-      time_name = #{record.timeName,jdbcType=VARCHAR}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -199,28 +199,28 @@
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
       </if>
-      <if test="startTime != null">
-        start_time = #{startTime,jdbcType=TIMESTAMP},
+      <if test="startDate != null">
+        start_date = #{startDate,jdbcType=DATE},
       </if>
-      <if test="endTime != null">
-        end_time = #{endTime,jdbcType=TIMESTAMP},
+      <if test="endDate != null">
+        end_date = #{endDate,jdbcType=DATE},
       </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
-      <if test="timeName != null">
-        time_name = #{timeName,jdbcType=VARCHAR},
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.macro.mall.model.SmsFlashPromotion">
     update sms_flash_promotion
     set title = #{title,jdbcType=VARCHAR},
-      start_time = #{startTime,jdbcType=TIMESTAMP},
-      end_time = #{endTime,jdbcType=TIMESTAMP},
+      start_date = #{startDate,jdbcType=DATE},
+      end_date = #{endDate,jdbcType=DATE},
       status = #{status,jdbcType=INTEGER},
-      time_name = #{timeName,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionProductRelationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.macro.mall.mapper.SmsFlashPromotionProductRelationMapper">
+  <resultMap id="BaseResultMap" type="com.macro.mall.model.SmsFlashPromotionProductRelation">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="flash_promotion_id" jdbcType="BIGINT" property="flashPromotionId" />
+    <result column="flash_promotion_session_id" jdbcType="BIGINT" property="flashPromotionSessionId" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
+    <result column="flash_promotion_price" jdbcType="DECIMAL" property="flashPromotionPrice" />
+    <result column="flash_promotion_count" jdbcType="INTEGER" property="flashPromotionCount" />
+    <result column="flash_promotion_limit" jdbcType="INTEGER" property="flashPromotionLimit" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, flash_promotion_id, flash_promotion_session_id, product_id, flash_promotion_price, 
+    flash_promotion_count, flash_promotion_limit, sort
+  </sql>
+  <select id="selectByExample" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelationExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from sms_flash_promotion_product_relation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sms_flash_promotion_product_relation
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from sms_flash_promotion_product_relation
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelationExample">
+    delete from sms_flash_promotion_product_relation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelation">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sms_flash_promotion_product_relation (flash_promotion_id, flash_promotion_session_id, 
+      product_id, flash_promotion_price, flash_promotion_count, 
+      flash_promotion_limit, sort)
+    values (#{flashPromotionId,jdbcType=BIGINT}, #{flashPromotionSessionId,jdbcType=BIGINT}, 
+      #{productId,jdbcType=BIGINT}, #{flashPromotionPrice,jdbcType=DECIMAL}, #{flashPromotionCount,jdbcType=INTEGER}, 
+      #{flashPromotionLimit,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelation">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sms_flash_promotion_product_relation
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="flashPromotionId != null">
+        flash_promotion_id,
+      </if>
+      <if test="flashPromotionSessionId != null">
+        flash_promotion_session_id,
+      </if>
+      <if test="productId != null">
+        product_id,
+      </if>
+      <if test="flashPromotionPrice != null">
+        flash_promotion_price,
+      </if>
+      <if test="flashPromotionCount != null">
+        flash_promotion_count,
+      </if>
+      <if test="flashPromotionLimit != null">
+        flash_promotion_limit,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="flashPromotionId != null">
+        #{flashPromotionId,jdbcType=BIGINT},
+      </if>
+      <if test="flashPromotionSessionId != null">
+        #{flashPromotionSessionId,jdbcType=BIGINT},
+      </if>
+      <if test="productId != null">
+        #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="flashPromotionPrice != null">
+        #{flashPromotionPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="flashPromotionCount != null">
+        #{flashPromotionCount,jdbcType=INTEGER},
+      </if>
+      <if test="flashPromotionLimit != null">
+        #{flashPromotionLimit,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelationExample" resultType="java.lang.Integer">
+    select count(*) from sms_flash_promotion_product_relation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update sms_flash_promotion_product_relation
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.flashPromotionId != null">
+        flash_promotion_id = #{record.flashPromotionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.flashPromotionSessionId != null">
+        flash_promotion_session_id = #{record.flashPromotionSessionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productId != null">
+        product_id = #{record.productId,jdbcType=BIGINT},
+      </if>
+      <if test="record.flashPromotionPrice != null">
+        flash_promotion_price = #{record.flashPromotionPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.flashPromotionCount != null">
+        flash_promotion_count = #{record.flashPromotionCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.flashPromotionLimit != null">
+        flash_promotion_limit = #{record.flashPromotionLimit,jdbcType=INTEGER},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update sms_flash_promotion_product_relation
+    set id = #{record.id,jdbcType=BIGINT},
+      flash_promotion_id = #{record.flashPromotionId,jdbcType=BIGINT},
+      flash_promotion_session_id = #{record.flashPromotionSessionId,jdbcType=BIGINT},
+      product_id = #{record.productId,jdbcType=BIGINT},
+      flash_promotion_price = #{record.flashPromotionPrice,jdbcType=DECIMAL},
+      flash_promotion_count = #{record.flashPromotionCount,jdbcType=INTEGER},
+      flash_promotion_limit = #{record.flashPromotionLimit,jdbcType=INTEGER},
+      sort = #{record.sort,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelation">
+    update sms_flash_promotion_product_relation
+    <set>
+      <if test="flashPromotionId != null">
+        flash_promotion_id = #{flashPromotionId,jdbcType=BIGINT},
+      </if>
+      <if test="flashPromotionSessionId != null">
+        flash_promotion_session_id = #{flashPromotionSessionId,jdbcType=BIGINT},
+      </if>
+      <if test="productId != null">
+        product_id = #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="flashPromotionPrice != null">
+        flash_promotion_price = #{flashPromotionPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="flashPromotionCount != null">
+        flash_promotion_count = #{flashPromotionCount,jdbcType=INTEGER},
+      </if>
+      <if test="flashPromotionLimit != null">
+        flash_promotion_limit = #{flashPromotionLimit,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelation">
+    update sms_flash_promotion_product_relation
+    set flash_promotion_id = #{flashPromotionId,jdbcType=BIGINT},
+      flash_promotion_session_id = #{flashPromotionSessionId,jdbcType=BIGINT},
+      product_id = #{productId,jdbcType=BIGINT},
+      flash_promotion_price = #{flashPromotionPrice,jdbcType=DECIMAL},
+      flash_promotion_count = #{flashPromotionCount,jdbcType=INTEGER},
+      flash_promotion_limit = #{flashPromotionLimit,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionSessionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.macro.mall.mapper.SmsFlashPromotionSessionMapper">
+  <resultMap id="BaseResultMap" type="com.macro.mall.model.SmsFlashPromotionSession">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="start_time" jdbcType="TIME" property="startTime" />
+    <result column="end_time" jdbcType="TIME" property="endTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, name, start_time, end_time, status, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.macro.mall.model.SmsFlashPromotionSessionExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from sms_flash_promotion_session
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sms_flash_promotion_session
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from sms_flash_promotion_session
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.macro.mall.model.SmsFlashPromotionSessionExample">
+    delete from sms_flash_promotion_session
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.macro.mall.model.SmsFlashPromotionSession">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sms_flash_promotion_session (name, start_time, end_time, 
+      status, create_time)
+    values (#{name,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME}, #{endTime,jdbcType=TIME}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.macro.mall.model.SmsFlashPromotionSession">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sms_flash_promotion_session
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        name,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIME},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIME},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionSessionExample" resultType="java.lang.Integer">
+    select count(*) from sms_flash_promotion_session
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update sms_flash_promotion_session
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIME},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIME},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update sms_flash_promotion_session
+    set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      start_time = #{record.startTime,jdbcType=TIME},
+      end_time = #{record.endTime,jdbcType=TIME},
+      status = #{record.status,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.macro.mall.model.SmsFlashPromotionSession">
+    update sms_flash_promotion_session
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIME},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIME},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.macro.mall.model.SmsFlashPromotionSession">
+    update sms_flash_promotion_session
+    set name = #{name,jdbcType=VARCHAR},
+      start_time = #{startTime,jdbcType=TIME},
+      end_time = #{endTime,jdbcType=TIME},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file