双十一活动 说明：

结算赠品：按照顺序结算时展示出赠品，赠品可以按顺序选择赠品，赠品含有库存设置。
秒杀：秒杀支持按照时间显示秒杀的价格。

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/activity/ActivityDate.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.core.entity.activity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.eo.Promotions;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -22,13 +23,12 @@ public class ActivityDate implements Serializable{
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date endDate;
-    //类型：  1：满减
-    private Integer type;
     //状态：true
     private boolean status;
     //说明
     private String remark;
-
+    //优惠活动
+    private Promotions promotions;
 
     public Date getBeginDate() {
         return beginDate;
@@ -46,14 +46,6 @@ public class ActivityDate implements Serializable{
         this.endDate = endDate;
     }
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
     public boolean isStatus() {
         return status;
     }
@@ -70,4 +62,11 @@ public class ActivityDate implements Serializable{
         this.remark = remark;
     }
 
+    public Promotions getPromotions() {
+        return promotions;
+    }
+
+    public void setPromotions(Promotions promotions) {
+        this.promotions = promotions;
+    }
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/CartDto.java

@@ -1,7 +1,10 @@
 package com.iamberry.wechat.core.entity.cart;
 
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -56,8 +59,8 @@ public class CartDto implements Serializable{
 	private Integer productIsSpell;//是否可拼团 1：不可拼团 2：可拼团
 	private Integer colorSpellAmount;//拼团价 单位为分
 
+	private List<ItemGift> itemGiftList;		//订单项关联赠品
 
-	
 	public String getProductColor() {
 		return productColor;
 	}
@@ -211,4 +214,14 @@ public class CartDto implements Serializable{
 	public void setColorSpellAmount(Integer colorSpellAmount) {
 		this.colorSpellAmount = colorSpellAmount;
 	}
+
+	public List<ItemGift> getItemGiftList() {
+		return itemGiftList;
+	}
+
+	public void setItemGiftList(List<ItemGift> itemGiftList) {
+		this.itemGiftList = itemGiftList;
+	}
+
+
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/SettlementGift.java

@@ -1,82 +0,0 @@
-package com.iamberry.wechat.core.entity.cart;
-
-import  java.util.Date;
-import  java.io.Serializable;
-/**
- *  结算赠品类
- * @author Administrator
- * @Date 2019-05-23
- */
-public class SettlementGift  implements  Serializable{
-    private static final long serialVersionUID = -1083848908128493893L;
-    //结算赠品Id
-    private Integer settGiftId;
-    //满足颜色id
-    private Integer settGiftFillColorId;
-    //
-    private Integer settGiftGiftColorId;
-    //价格
-    private Integer settGiftPrice;
-    //赠送数量
-    private Integer settGiftNum;
-    //1.使用中 2.未使用
-    private Integer settGiftStatus;
-    //创建时间'
-    private Date settGiftCreateTime;
-
-    public Integer getSettGiftId(){
-        return settGiftId;
-    }
-
-    public void setSettGiftId(Integer  settGiftId){
-        this.settGiftId=settGiftId;
-    }
-
-    public Integer getSettGiftFillColorId(){
-        return settGiftFillColorId;
-    }
-
-    public void setSettGiftFillColorId(Integer  settGiftFillColorId){
-        this.settGiftFillColorId=settGiftFillColorId;
-    }
-
-    public Integer getSettGiftGiftColorId(){
-        return settGiftGiftColorId;
-    }
-
-    public void setSettGiftGiftColorId(Integer  settGiftGiftColorId){
-        this.settGiftGiftColorId=settGiftGiftColorId;
-    }
-
-    public Integer getSettGiftPrice(){
-        return settGiftPrice;
-    }
-
-    public void setSettGiftPrice(Integer  settGiftPrice){
-        this.settGiftPrice=settGiftPrice;
-    }
-
-    public Integer getSettGiftNum(){
-        return settGiftNum;
-    }
-
-    public void setSettGiftNum(Integer  settGiftNum){
-        this.settGiftNum=settGiftNum;
-    }
-
-    public Integer getSettGiftStatus(){
-        return settGiftStatus;
-    }
-
-    public void setSettGiftStatus(Integer  settGiftStatus){
-        this.settGiftStatus=settGiftStatus;
-    }
-
-    public Date getSettGiftCreateTime(){
-        return settGiftCreateTime;
-    }
-
-    public void setSettGiftCreateTime(Date  settGiftCreateTime){
-        this.settGiftCreateTime=settGiftCreateTime;
-    }
-}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/GiftCondition.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.eo;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  赠品条件类
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public class GiftCondition  implements  Serializable{
+    private static final long serialVersionUID = -671237415967603102L;
+    //赠品条件id
+    private Integer giftConditionId;
+    //赠品id
+    private Integer settGiftId;
+    //满足颜色id
+    private Integer giftConditionFillColorId;
+    //创建时间'
+    private Date giftConditionCreateTime;
+
+    public Integer getGiftConditionId(){
+        return giftConditionId;
+    }
+
+    public void setGiftConditionId(Integer  giftConditionId){
+        this.giftConditionId=giftConditionId;
+    }
+
+    public Integer getSettGiftId(){
+        return settGiftId;
+    }
+
+    public void setSettGiftId(Integer  settGiftId){
+        this.settGiftId=settGiftId;
+    }
+
+    public Integer getGiftConditionFillColorId(){
+        return giftConditionFillColorId;
+    }
+
+    public void setGiftConditionFillColorId(Integer  giftConditionFillColorId){
+        this.giftConditionFillColorId=giftConditionFillColorId;
+    }
+
+    public Date getGiftConditionCreateTime(){
+        return giftConditionCreateTime;
+    }
+
+    public void setGiftConditionCreateTime(Date  giftConditionCreateTime){
+        this.giftConditionCreateTime=giftConditionCreateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/GiftPool.java

@@ -0,0 +1,122 @@
+package com.iamberry.wechat.core.entity.eo;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  赠品池类
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public class GiftPool  implements  Serializable{
+    private static final long serialVersionUID = 7148244471904713727L;
+    //赠品池id
+    private Integer giftPoolId;
+    //赠品id
+    private Integer settGiftId;
+    //赠送颜色id
+    private Integer giftPoolColorId;
+    //价格
+    private Integer giftPoolPrice;
+    //赠送数量
+    private Integer giftPoolNum;
+    //状态 1.使用中 2.未使用
+    private Integer giftPoolStatus;
+    //顺序
+    private Integer giftPoolSort;
+    //库存
+    private Integer giftPoolStock;
+    //关系 1:互斥 2:共用
+    private Integer giftPoolRelation;
+    //关系描述
+    private String giftPoolRelationDesc;
+    //创建时间'
+    private Date giftPoolCreateTime;
+
+    public Integer getGiftPoolId(){
+        return giftPoolId;
+    }
+
+    public void setGiftPoolId(Integer  giftPoolId){
+        this.giftPoolId=giftPoolId;
+    }
+
+    public Integer getSettGiftId(){
+        return settGiftId;
+    }
+
+    public void setSettGiftId(Integer  settGiftId){
+        this.settGiftId=settGiftId;
+    }
+
+    public Integer getGiftPoolColorId(){
+        return giftPoolColorId;
+    }
+
+    public void setGiftPoolColorId(Integer  giftPoolColorId){
+        this.giftPoolColorId=giftPoolColorId;
+    }
+
+    public Integer getGiftPoolPrice(){
+        return giftPoolPrice;
+    }
+
+    public void setGiftPoolPrice(Integer  giftPoolPrice){
+        this.giftPoolPrice=giftPoolPrice;
+    }
+
+    public Integer getGiftPoolNum(){
+        return giftPoolNum;
+    }
+
+    public void setGiftPoolNum(Integer  giftPoolNum){
+        this.giftPoolNum=giftPoolNum;
+    }
+
+    public Integer getGiftPoolStatus(){
+        return giftPoolStatus;
+    }
+
+    public void setGiftPoolStatus(Integer  giftPoolStatus){
+        this.giftPoolStatus=giftPoolStatus;
+    }
+
+    public Integer getGiftPoolSort(){
+        return giftPoolSort;
+    }
+
+    public void setGiftPoolSort(Integer  giftPoolSort){
+        this.giftPoolSort=giftPoolSort;
+    }
+
+    public Integer getGiftPoolStock(){
+        return giftPoolStock;
+    }
+
+    public void setGiftPoolStock(Integer  giftPoolStock){
+        this.giftPoolStock=giftPoolStock;
+    }
+
+    public Integer getGiftPoolRelation() {
+        return giftPoolRelation;
+    }
+
+    public void setGiftPoolRelation(Integer giftPoolRelation) {
+        this.giftPoolRelation = giftPoolRelation;
+    }
+
+    public String getGiftPoolRelationDesc() {
+        return giftPoolRelationDesc;
+    }
+
+    public void setGiftPoolRelationDesc(String giftPoolRelationDesc) {
+        this.giftPoolRelationDesc = giftPoolRelationDesc;
+    }
+
+    public Date getGiftPoolCreateTime(){
+        return giftPoolCreateTime;
+    }
+
+    public void setGiftPoolCreateTime(Date  giftPoolCreateTime){
+        this.giftPoolCreateTime=giftPoolCreateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/ItemGift.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.eo;
+
+import java.io.Serializable;
+
+/**
+ *  订单项关联赠品池类
+ * @author Administrator
+ * @Date 2019-10-29
+ */
+public class ItemGift  implements Serializable {
+    private static final long serialVersionUID = 1321211845089063931L;
+    //关联id
+    private Integer itemGiftId;
+    //订单项ID
+    private Integer itemId;
+    //赠品池ID
+    private Integer giftPoolId;
+    //数量'
+    private Integer itemGiftNum;
+
+    public Integer getItemGiftId(){
+        return itemGiftId;
+    }
+
+    public void setItemGiftId(Integer  itemGiftId){
+        this.itemGiftId=itemGiftId;
+    }
+
+    public Integer getItemId(){
+        return itemId;
+    }
+
+    public void setItemId(Integer  itemId){
+        this.itemId=itemId;
+    }
+
+    public Integer getGiftPoolId(){
+        return giftPoolId;
+    }
+
+    public void setGiftPoolId(Integer  giftPoolId){
+        this.giftPoolId=giftPoolId;
+    }
+
+    public Integer getItemGiftNum(){
+        return itemGiftNum;
+    }
+
+    public void setItemGiftNum(Integer  itemGiftNum){
+        this.itemGiftNum=itemGiftNum;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/Promotions.java

@@ -0,0 +1,115 @@
+package com.iamberry.wechat.core.entity.eo;
+
+import java.util.ArrayList;
+import  java.util.Date;
+import  java.io.Serializable;
+import java.util.List;
+
+/**
+ *  优惠活动类
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public class Promotions  implements  Serializable{
+    private static final long serialVersionUID = 8267100500015387060L;
+    //活动id
+    private Integer promotionsId;
+    //活动名称
+    private String promotionsName;
+    //类型 1：满减 2：满赠 3：秒杀
+    private Integer promotionsType;
+    //状态 1.使用中 2.未使用
+    private Integer promotionsStatus;
+    //活动开始时间
+    private Date promotionsBeginTime;
+    //活动结束时间
+    private Date promotionsEndTime;
+    //备注
+    private String promotionsDesc;
+    //创建时间'
+    private Date promotionsCreateTime;
+    //结算赠品
+    private List<SettlementGift> settlementGiftList = new ArrayList<>();
+    //结算赠品
+    private List<Spike> spikeList = new ArrayList<>();
+
+    public Integer getPromotionsId(){
+        return promotionsId;
+    }
+
+    public void setPromotionsId(Integer  promotionsId){
+        this.promotionsId=promotionsId;
+    }
+
+    public String getPromotionsName(){
+        return promotionsName;
+    }
+
+    public void setPromotionsName(String  promotionsName){
+        this.promotionsName=promotionsName;
+    }
+
+    public Integer getPromotionsType(){
+        return promotionsType;
+    }
+
+    public void setPromotionsType(Integer  promotionsType){
+        this.promotionsType=promotionsType;
+    }
+
+    public Integer getPromotionsStatus(){
+        return promotionsStatus;
+    }
+
+    public void setPromotionsStatus(Integer  promotionsStatus){
+        this.promotionsStatus=promotionsStatus;
+    }
+
+    public Date getPromotionsBeginTime(){
+        return promotionsBeginTime;
+    }
+
+    public void setPromotionsBeginTime(Date  promotionsBeginTime){
+        this.promotionsBeginTime=promotionsBeginTime;
+    }
+
+    public Date getPromotionsEndTime(){
+        return promotionsEndTime;
+    }
+
+    public void setPromotionsEndTime(Date  promotionsEndTime){
+        this.promotionsEndTime=promotionsEndTime;
+    }
+
+    public String getPromotionsDesc(){
+        return promotionsDesc;
+    }
+
+    public void setPromotionsDesc(String  promotionsDesc){
+        this.promotionsDesc=promotionsDesc;
+    }
+
+    public Date getPromotionsCreateTime(){
+        return promotionsCreateTime;
+    }
+
+    public void setPromotionsCreateTime(Date  promotionsCreateTime){
+        this.promotionsCreateTime=promotionsCreateTime;
+    }
+
+    public List<SettlementGift> getSettlementGiftList() {
+        return settlementGiftList;
+    }
+
+    public void setSettlementGiftList(List<SettlementGift> settlementGiftList) {
+        this.settlementGiftList = settlementGiftList;
+    }
+
+    public List<Spike> getSpikeList() {
+        return spikeList;
+    }
+
+    public void setSpikeList(List<Spike> spikeList) {
+        this.spikeList = spikeList;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/SettlementGift.java

@@ -0,0 +1,94 @@
+package com.iamberry.wechat.core.entity.eo;
+import java.util.ArrayList;
+import  java.util.Date;
+import  java.io.Serializable;
+import java.util.List;
+
+/**
+ *  结算赠品类
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public class SettlementGift  implements  Serializable{
+    private static final long serialVersionUID = -2406158685606440068L;
+    //结算赠品Id
+    private Integer settGiftId;
+    //活动id
+    private Integer promotionsId;
+    //1.使用中 2.未使用
+    private Integer settGiftStatus;
+    //备注
+    private String settGiftDesc;
+    //顺序
+    private Integer settGiftSort;
+    //创建时间'
+    private Date settGiftCreateTime;
+    //赠品条件类
+    private List<GiftCondition> giftConditionList = new ArrayList<>();
+    //赠品池
+    private List<GiftPool> giftPoolList = new ArrayList<>();
+
+    public Integer getSettGiftId(){
+        return settGiftId;
+    }
+
+    public void setSettGiftId(Integer  settGiftId){
+        this.settGiftId=settGiftId;
+    }
+
+    public Integer getPromotionsId(){
+        return promotionsId;
+    }
+
+    public void setPromotionsId(Integer  promotionsId){
+        this.promotionsId=promotionsId;
+    }
+
+    public Integer getSettGiftStatus(){
+        return settGiftStatus;
+    }
+
+    public void setSettGiftStatus(Integer  settGiftStatus){
+        this.settGiftStatus=settGiftStatus;
+    }
+
+    public String getSettGiftDesc(){
+        return settGiftDesc;
+    }
+
+    public void setSettGiftDesc(String  settGiftDesc){
+        this.settGiftDesc=settGiftDesc;
+    }
+
+    public Date getSettGiftCreateTime(){
+        return settGiftCreateTime;
+    }
+
+    public void setSettGiftCreateTime(Date  settGiftCreateTime){
+        this.settGiftCreateTime=settGiftCreateTime;
+    }
+
+    public Integer getSettGiftSort() {
+        return settGiftSort;
+    }
+
+    public void setSettGiftSort(Integer settGiftSort) {
+        this.settGiftSort = settGiftSort;
+    }
+
+    public List<GiftCondition> getGiftConditionList() {
+        return giftConditionList;
+    }
+
+    public void setGiftConditionList(List<GiftCondition> giftConditionList) {
+        this.giftConditionList = giftConditionList;
+    }
+
+    public List<GiftPool> getGiftPoolList() {
+        return giftPoolList;
+    }
+
+    public void setGiftPoolList(List<GiftPool> giftPoolList) {
+        this.giftPoolList = giftPoolList;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/Spike.java

@@ -0,0 +1,82 @@
+package com.iamberry.wechat.core.entity.eo;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  秒杀类
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public class Spike  implements  Serializable{
+    private static final long serialVersionUID = -2749553830069392383L;
+    //秒杀id
+    private Integer spikeId;
+    //活动id
+    private Integer promotionsId;
+    //满足颜色id
+    private Integer spikeColorId;
+    //
+    private Integer spikePrice;
+    //
+    private Integer spikeDiscount;
+    //状态 1.使用中 2.未使用
+    private String spikeStatus;
+    //创建时间'
+    private Date spikeCreateTime;
+
+    public Integer getSpikeId(){
+        return spikeId;
+    }
+
+    public void setSpikeId(Integer  spikeId){
+        this.spikeId=spikeId;
+    }
+
+    public Integer getPromotionsId(){
+        return promotionsId;
+    }
+
+    public void setPromotionsId(Integer  promotionsId){
+        this.promotionsId=promotionsId;
+    }
+
+    public Integer getSpikeColorId(){
+        return spikeColorId;
+    }
+
+    public void setSpikeColorId(Integer  spikeColorId){
+        this.spikeColorId=spikeColorId;
+    }
+
+    public Integer getSpikePrice(){
+        return spikePrice;
+    }
+
+    public void setSpikePrice(Integer  spikePrice){
+        this.spikePrice=spikePrice;
+    }
+
+    public Integer getSpikeDiscount() {
+        return spikeDiscount;
+    }
+
+    public void setSpikeDiscount(Integer spikeDiscount) {
+        this.spikeDiscount = spikeDiscount;
+    }
+
+    public String getSpikeStatus(){
+        return spikeStatus;
+    }
+
+    public void setSpikeStatus(String  spikeStatus){
+        this.spikeStatus=spikeStatus;
+    }
+
+    public Date getSpikeCreateTime(){
+        return spikeCreateTime;
+    }
+
+    public void setSpikeCreateTime(Date  spikeCreateTime){
+        this.spikeCreateTime=spikeCreateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/OrderItem.java

@@ -1,6 +1,9 @@
 package com.iamberry.wechat.core.entity.order;
 
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author 何秀刚
@@ -43,10 +46,9 @@ public class OrderItem implements Serializable {
 	//			5：青色	6：蓝色	7：紫色	8：白色
 	
 	private String produectRemark;		//产品备注，存放百胜商品69码的
-	
-	
-	
-	
+
+	private List<ItemGift> itemGiftList;		//订单项关联赠品
+
 	public Integer getItemColorId() {
 		return itemColorId;
 	}
@@ -171,6 +173,12 @@ public class OrderItem implements Serializable {
 	public void setProductStatus(Integer productStatus) {
 		this.productStatus = productStatus;
 	}
-	
-	
+
+	public List<ItemGift> getItemGiftList() {
+		return itemGiftList;
+	}
+
+	public void setItemGiftList(List<ItemGift> itemGiftList) {
+		this.itemGiftList = itemGiftList;
+	}
 }

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/eo/GiftConditionService.java

@@ -0,0 +1,25 @@
+package com.iamberry.wechat.face.eo;
+
+import com.iamberry.wechat.core.entity.eo.GiftCondition;
+
+import java.util.List;
+
+/**
+ *  赠品条件接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface GiftConditionService {
+    /**
+     * 获取集合
+     * @param  giftCondition
+     * @return List
+     */
+    List<GiftCondition> getGiftConditionList(GiftCondition  giftCondition);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftCondition
+     */
+    GiftCondition  getGiftConditionById(Integer  id);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/eo/GiftPoolService.java

@@ -0,0 +1,38 @@
+package com.iamberry.wechat.face.eo;
+
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+
+import java.util.List;
+
+/**
+ *  赠品池接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface GiftPoolService {
+    /**
+     * 获取集合
+     * @param  giftPool
+     * @return List
+     */
+    List<GiftPool> getGiftPoolList(GiftPool  giftPool);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftPool
+     */
+    GiftPool  getGiftPoolById(Integer  id);
+
+    /**
+     * 修改数据 - 减去库存
+     * @param  giftPool
+     * @return Integer
+     */
+    Integer  updateStock(GiftPool  giftPool);
+    /**
+     * 修改数据 - 增加库存
+     * @param  giftPool
+     * @return Integer
+     */
+    Integer  updateAddStock(GiftPool  giftPool);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/eo/ItemGiftService.java

@@ -0,0 +1,45 @@
+package com.iamberry.wechat.face.eo;
+
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+
+import java.util.List;
+
+/**
+ *  订单项关联赠品池接口
+ * @author Administrator
+ * @Date 2019-10-29
+ */
+public interface ItemGiftService {
+    /**
+     * 获取集合
+     * @param  itemGift
+     * @return List
+     */
+    List<ItemGift> getItemGiftList(ItemGift  itemGift);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  itemGift
+     */
+    ItemGift  getItemGiftById(Integer  id);
+    /**
+     * 增加数据
+     * @param  itemGift
+     * @return Integer
+     */
+    Integer  save(ItemGift  itemGift);
+    /**
+     * 修改数据
+     * @param  itemGift
+     * @return Integer
+     */
+    Integer  update(ItemGift  itemGift);
+
+    /**
+     * 增加数据 <集合>
+     * @param  itemGiftList
+     * @return Integer
+     */
+    Integer  saveList(List<ItemGift>  itemGiftList);
+
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/eo/PromotionsService.java

@@ -0,0 +1,30 @@
+package com.iamberry.wechat.face.eo;
+
+import com.iamberry.wechat.core.entity.eo.Promotions;
+
+import java.util.List;
+
+/**
+ *  优惠活动接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface PromotionsService {
+    /**
+     * 获取集合
+     * @param  promotions
+     * @return List
+     */
+    List<Promotions> getPromotionsList(Promotions  promotions);
+    /**
+     * 获取集合
+     * @return List
+     */
+    Promotions getPromotionsListByTime();
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  promotions
+     */
+    Promotions  getPromotionsById(Integer  id);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/SettlementGiftService.java

@@ -1,6 +1,7 @@
-package com.iamberry.wechat.face.cart;
+package com.iamberry.wechat.face.eo;
 
-import com.iamberry.wechat.core.entity.cart.SettlementGift;
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.SettlementGift;
 
 import java.util.List;
 
@@ -17,21 +18,16 @@ public interface SettlementGiftService {
      */
     List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift);
     /**
+     * 获取集合-所有活动的满赠
+     * @param  promotionsList
+     * @return List
+     */
+    List<SettlementGift> getSettlementGiftListAll(int[] str);
+    /**
      * 查询单条数据
      * @param  id
      * @return  settlementGift
      */
     SettlementGift  getSettlementGiftById(Integer  id);
-    /**
-     * 增加数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    Integer  save(SettlementGift  settlementGift);
-    /**
-     * 修改数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    Integer  update(SettlementGift  settlementGift);
+
 }

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/eo/SpikeService.java

@@ -0,0 +1,32 @@
+package com.iamberry.wechat.face.eo;
+
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.Spike;
+
+import java.util.List;
+
+/**
+ *  秒杀接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface SpikeService {
+    /**
+     * 获取集合
+     * @param  spike
+     * @return List
+     */
+    List<Spike> getSpikeList(Spike  spike);
+    /**
+     * 获取集合
+     * @param  str
+     * @return List
+     */
+    List<Spike> getSpikeListAll(int[] str);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  spike
+     */
+    Spike  getSpikeById(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/ActivityUtil.java

@@ -1,15 +1,31 @@
 package com.iamberry.wechat.service;
 
-
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.admin.FullReduction;
+import com.iamberry.wechat.core.entity.cart.CartDto;
+import com.iamberry.wechat.core.entity.eo.*;
+import com.iamberry.wechat.core.entity.product.Product;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.face.cart.ProductInfoService;
+import com.iamberry.wechat.face.eo.PromotionsService;
+import com.iamberry.wechat.face.eo.SettlementGiftService;
 import com.iamberry.wechat.face.member.MemberService;
+import org.apache.poi.ss.formula.functions.T;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 上朵活动类
@@ -17,62 +33,297 @@ import java.util.Date;
 @Component
 public class ActivityUtil {
 
+    Logger logger = LoggerFactory.getLogger(ActivityUtil.class);
+
     @Autowired
     private SystemService systemService;
-
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private PromotionsService promotionsService;
+    @Autowired
+    private ProductInfoService productInfoService;
 
     private SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     /**
      * 获取日期
-     * @param type
      * @return
      */
-    private ActivityDate initDate(Integer type){
+    private ActivityDate initDate(){
         ActivityDate activityDate  = new ActivityDate();
+        activityDate.setStatus(false);
+        String begin = systemService.selectOneShopRuleByIdDynamic(236).getRuleDesc();
+        String end = systemService.selectOneShopRuleByIdDynamic(237).getRuleDesc();
         try {
-            switch (type){
-                case 1:
-                    String begin = systemService.selectOneShopRuleByIdDynamic(236).getRuleDesc();
-                    activityDate.setBeginDate(sd.parse(begin)); ;
-                    String end = systemService.selectOneShopRuleByIdDynamic(237).getRuleDesc();
-                    activityDate.setEndDate(sd.parse(end));
-                    break;
-                default:
-                    activityDate = null;
-                    break;
-            }
-        }catch (Exception e){
-            activityDate = null;
+            activityDate.setBeginDate(sd.parse(begin));
+            activityDate.setEndDate(sd.parse(end));
+        } catch (ParseException e) {
+            logger.info("活动日期转换错误！");
             e.printStackTrace();
+            activityDate.setStatus(false);
+            return activityDate;
+        }
+        Date date = new Date();
+        if (activityDate.getBeginDate().before(date) && date.before(activityDate.getEndDate())){  //beginDate 比 date 早? true ：false
+            activityDate.setStatus(true);
         }
-
         return activityDate;
     }
 
+    /**
+     * 判断是否在注销时间内
+     * @return 期限内true；
+     */
+    public boolean isActivity(){
+        ActivityDate activityDate = initDate();
+        return activityDate.isStatus();
+    }
 
     /**
      * 判断是否在注销时间内
      * @return 期限内true；
      */
-    public ActivityDate isActivity(){
-        ActivityDate activityDate = initDate(1);
+    public ActivityDate getActivityDate(){
+        ActivityDate activityDate = initDate();
+        if(!activityDate.isStatus()){
+            return activityDate;
+        }
+        Promotions promotions = getAllPromotions();
+        activityDate.setPromotions(promotions);
+        return activityDate;
+    }
 
-        activityDate.setRemark("618活动");
+    /**
+     * 获取所有优惠信息
+     * @return 期限内true；
+     */
+    public Promotions getAllPromotions(){
+        if(!isActivity()){
+            return null;
+        }
+        return promotionsService.getPromotionsListByTime();
+    }
 
-        if(activityDate == null){
-            activityDate.setStatus(false);
+    /**
+     * 获取所有优惠信息
+     * @return 期限内true；
+     */
+    public void preferential(List<CartDto> cartDtoList){
+        if(!isActivity()){
+            return ;
         }
-        Date date = new Date();
+        Promotions promotions = promotionsService.getPromotionsListByTime();
+        this.giftCartPriv(cartDtoList,promotions);
+        this.getColorSpikePriv(cartDtoList,promotions);
+    }
 
-        if (activityDate.getBeginDate().before(date) && date.before(activityDate.getEndDate())){  //beginDate 比 date 早? true ：false
-            activityDate.setStatus(true);
-            return activityDate;
+    /**
+     * 赠送赠品
+     * @param cartDtoList
+     */
+    public void giftCart(List<CartDto> cartDtoList){
+        if(!isActivity()){
+            return;
+        }
+        Promotions promotions = promotionsService.getPromotionsListByTime();
+        this.giftCartPriv(cartDtoList,promotions);
+    }
+
+    /**
+     * 查询秒杀
+     * @param colorId
+     */
+    public Spike getColorSpike(Integer colorId){
+        Spike spk = new Spike();
+        if(!isActivity()){
+            return null;
+        }
+        Promotions promotions = promotionsService.getPromotionsListByTime();
+        return this.getColorSpikePriv(colorId,promotions);
+    }
+    /**
+     * 查询秒杀
+     * @param list
+     */
+    public void getColorSpike(List list){
+        if(!isActivity()){
+            return;
+        }
+        Promotions promotions = promotionsService.getPromotionsListByTime();
+        this.getColorSpikePriv(list,promotions);
+    }
+
+    /**
+     * 赠送赠品
+     * @param cartDtoList
+     */
+    public void giftCartPriv(List<CartDto> cartDtoList,Promotions promotions){
+        if(promotions == null){
+            return;
+        }
+        List<CartDto> giftList = new ArrayList<>();
+        for (SettlementGift settlementGift:promotions.getSettlementGiftList()) {
+            boolean isHaveColor = false;
+            for (CartDto cd:cartDtoList) {
+                Integer cdNum = 0;
+                for (GiftCondition giftCondition:settlementGift.getGiftConditionList()) {
+                    if(cd.getCartColorId() == giftCondition.getGiftConditionFillColorId()){//添加赠送产品
+                        isHaveColor = true;
+                        cdNum = cd.getCartNum();
+                    }
+                }
+
+                if(isHaveColor){
+                    String giftPoolRelationDesc = "";
+                    for (GiftPool giftPool:settlementGift.getGiftPoolList()) {
+                        CartDto cartDto = new CartDto();
+
+                        Integer num = giftPool.getGiftPoolNum();
+                        if(giftPool.getGiftPoolNum() < 1){	//判断赠送数量，大于0就用该数量
+                            num = cdNum;
+                        }
+                        if(num > giftPool.getGiftPoolStock()){
+                            continue;
+                        }
+
+                        if(!"".equals(giftPoolRelationDesc)){
+                            if(1 == giftPool.getGiftPoolRelation() || !giftPoolRelationDesc.equals(giftPool.getGiftPoolRelationDesc())){
+                                continue;
+                            }
+                        }
+
+                        cartDto.setCartColorId(giftPool.getGiftPoolColorId());
+                        cartDto.setCartNum(num);
+                        cartDto.setProductDiscount(giftPool.getGiftPoolPrice());
+                        cartDto.setProductPrice(giftPool.getGiftPoolPrice());
+                        cartDto.setTotal(giftPool.getGiftPoolPrice()*num);
+                        cartDto.setProductIsSpell(1);
+                        cartDto.setColorSpellAmount(0);
+
+                        List<ItemGift> itemGiftList = new ArrayList<>();
+                        ItemGift itemGift = new ItemGift();
+                        itemGift.setGiftPoolId(giftPool.getGiftPoolId());
+                        itemGift.setItemGiftNum(num);
+                        itemGiftList.add(itemGift);
+                        cartDto.setItemGiftList(itemGiftList);
+
+                        giftList.add(cartDto);
+
+                        giftPool.setGiftPoolStock(giftPool.getGiftPoolStock()-num);
+
+                        if( 1 == giftPool.getGiftPoolRelation()){
+                            break;
+                        }else{
+                            giftPoolRelationDesc = giftPool.getGiftPoolRelationDesc();
+                        }
+                    }
+                }
+            }
+        }
+
+        List<CartDto> newGiftList = new ArrayList<>();
+		if(giftList != null && giftList.size() > 0){
+			for (CartDto carD:giftList) {
+				boolean fl = false;
+				for(CartDto newCarD:newGiftList) {
+					if(newCarD.getCartColorId() == carD.getCartColorId()){	//赠品相同，合并
+						fl = true;
+						newCarD.setCartNum(newCarD.getCartNum() + carD.getCartNum());
+						newCarD.setProductDiscount(newCarD.getProductDiscount() +  carD.getProductDiscount());
+						newCarD.setProductPrice( newCarD.getProductPrice() + carD.getProductPrice());
+						newCarD.setTotal(newCarD.getTotal() + carD.getTotal());
+                        if(carD.getItemGiftList() != null && carD.getItemGiftList().size() > 0){
+                            if(newCarD.getItemGiftList() != null && newCarD.getItemGiftList().size() > 0){
+                                List<ItemGift> itemIG = new ArrayList<>();
+                                for (ItemGift carDIG:carD.getItemGiftList()) {
+                                    for (ItemGift newCarDIG:newCarD.getItemGiftList()) {
+                                        if(carDIG.getGiftPoolId() == newCarDIG.getGiftPoolId()){
+                                            newCarDIG.setItemGiftNum(newCarDIG.getItemGiftNum()+carDIG.getItemGiftNum());
+                                        }
+                                    }
+                                }
+                            }else{
+                                newCarD.setItemGiftList(carD.getItemGiftList());
+                            }
+                        }
+					}
+				}
+				if(!fl){
+					Product product = productInfoService.selectProductByColorId(carD.getCartColorId());
+					carD.setCartId(1);
+					carD.setCartProductId(product.getProductId());
+					carD.setProductName("【赠品】"+product.getProductName());
+					carD.setProductType(product.getProductTypeId());
+					carD.setProductStatus(1);
+					carD.setProductIntroduceImg(product.getColorImg());
+					carD.setProductRemark(product.getColorPresent());
+					carD.setProductColor(product.getColorName());
+					carD.setColorImg(product.getColorImg());
+					CartDto newCartDto = new CartDto();
+					BeanUtils.copyProperties(carD,newCartDto);
+					newGiftList.add(newCartDto);
+				}
+			}
+		}
+		if(newGiftList != null && newGiftList.size() > 0){
+			cartDtoList.addAll(newGiftList);
+		}
+    }
+
+    /**
+     * 查询秒杀
+     * @param colorId
+     */
+    public Spike getColorSpikePriv(Integer colorId,Promotions promotions){
+        Spike spk = new Spike();
+        if(promotions == null){
+            return null;
+        }
+        for (Spike spike:promotions.getSpikeList()) {
+            if(colorId == spike.getSpikeColorId()){
+                spk = spike;
+            }
+        }
+        return spk;
+    }
+
+    /**
+     * 查询秒杀
+     */
+    public void getColorSpikePriv(List list,Promotions promotions){
+        if(promotions == null){
+            return;
+        }
+        if(list==null || list.size()<1){
+            return;
+        }
+        String nowClass = list.get(0).getClass().getName();
+        switch (nowClass){
+            case ("com.iamberry.wechat.core.entity.product.ProductColor"):
+                for (Object obj:list) {
+                    for (Spike spike:promotions.getSpikeList()) {
+                        ProductColor productColor = (ProductColor) obj;
+                        if(spike.getSpikeColorId() == productColor.getColorId()){
+                            productColor.setColorPrice(spike.getSpikePrice());
+                            productColor.setColorDiscount(spike.getSpikeDiscount());
+                        }
+                    }
+                }
+                break;
+            case "com.iamberry.wechat.core.entity.cart.CartDto":
+                for (Object obj:list) {
+                    for (Spike spike:promotions.getSpikeList()) {
+                        CartDto cd = (CartDto) obj;
+                        if(spike.getSpikeColorId() == cd.getCartColorId()){
+                            cd.setProductPrice(spike.getSpikePrice());
+                            cd.setProductDiscount(spike.getSpikeDiscount());
+                        }
+                    }
+                }
+                break;
+                default:break;
         }
-        activityDate.setStatus(false);
-        return activityDate;
     }
 
     /**

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -2,6 +2,10 @@ package com.iamberry.wechat.service.cart;
 
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+import com.iamberry.wechat.face.eo.GiftPoolService;
+import com.iamberry.wechat.face.eo.ItemGiftService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +28,7 @@ import com.iamberry.wechat.face.member.CashLogService;
 import com.iamberry.wechat.face.reback.RebackServices;
 import com.iamberry.wechat.service.cart.dao.CartDao;
 import com.iamberry.wechat.service.order.dao.AdminOrderDao;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class CartServiceImpl implements CartService {
@@ -43,6 +48,10 @@ public class CartServiceImpl implements CartService {
 	private RebackServices rebackServices;
 	@Autowired
 	ProductInfoService productInfoService;
+	@Autowired
+	ItemGiftService itemGiftService;
+	@Autowired
+	GiftPoolService giftPoolService;
 
 
 	@Override
@@ -123,15 +132,37 @@ public class CartServiceImpl implements CartService {
 	}
 
 	@Override
+	@Transactional
 	public boolean addOrderAndSaveOrderItem(Order order, List<OrderItem> items, List<Integer> cartIds) throws Exception {
 		// TODO Auto-generated method stub
 		int count = cartDao.insertOrderInfo(order);
 		if (count < 1) {
-			throw new Exception();
+			throw new RuntimeException("添加订单失败");
 		}
-		count = cartDao.insertOrderItemList(items);
-		if (count < 1) {
-			throw new Exception();
+		for (OrderItem oi: items) {
+			count = cartDao.save(oi);
+			if (count < 1) {
+				throw new RuntimeException("添加订单项失败");
+			}
+
+			if(oi.getItemGiftList() != null && oi.getItemGiftList().size() > 0){
+				for (ItemGift ig : oi.getItemGiftList()) {
+					ig.setItemId(oi.getItemId());
+
+					GiftPool giftPool = new GiftPool();
+					giftPool.setGiftPoolId(ig.getGiftPoolId());
+					giftPool.setGiftPoolStock(ig.getItemGiftNum());
+					count = giftPoolService.updateStock(giftPool);
+					if (count < 1) {
+						throw new RuntimeException("修改订单项关联赠品库存失败");
+					}
+				}
+
+				count = itemGiftService.saveList(oi.getItemGiftList());
+				if (count < 1) {
+					throw new RuntimeException("添加订单项赠品失败");
+				}
+			}
 		}
 		// 删除购物车项目
 		cartDao.deleteBatchCartListById(cartIds);

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/SettlementGiftServiceImpl.java

@@ -1,56 +0,0 @@
-package com.iamberry.wechat.service.cart;
-
-import com.iamberry.wechat.core.entity.cart.SettlementGift;
-import com.iamberry.wechat.face.cart.SettlementGiftService;
-import com.iamberry.wechat.service.mapper.SettlementGiftMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- *  结算赠品接口
- * @author Administrator
- * @Date 2019-05-23
- */
-@Service
-public class SettlementGiftServiceImpl  implements SettlementGiftService {
-    @Autowired
-    private SettlementGiftMapper settlementGiftMapper;
-    /**
-     * 获取集合
-     * @param  settlementGift
-     * @return List
-     */
-    @Override
-    public List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift){
-        return  settlementGiftMapper.getSettlementGiftList(settlementGift);
-    }
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  settlementGift
-     */
-    @Override
-    public  SettlementGift  getSettlementGiftById(Integer  id){
-        return  settlementGiftMapper.getSettlementGiftById(id);
-    }
-    /**
-     * 增加数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    @Override
-    public  Integer  save(SettlementGift  settlementGift){
-        return  settlementGiftMapper.save(settlementGift);
-    }
-    /**
-     * 修改数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    @Override
-    public  Integer  update(SettlementGift  settlementGift){
-        return  settlementGiftMapper.update(settlementGift);
-    }
-}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/CartDao.java

@@ -71,6 +71,13 @@ public interface CartDao {
 	public Integer insertOrderItemList(List<OrderItem> items);
 
 	/**
+	 * 增加数据
+	 * @param  orderItem
+	 * @return Integer
+	 */
+	Integer  save(OrderItem  orderItem);
+
+	/**
 	 * 修改订单信息
 	 * @param order
 	 * @return

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/CartDaoImpl.java

@@ -121,6 +121,16 @@ public class CartDaoImpl implements CartDao{
 		return orderMapper.insertOrderItemList(items);
 	}
 
+	/**
+	 * 增加数据
+	 * @param  orderItem
+	 * @return Integer
+	 */
+	@Override
+	public  Integer  save(OrderItem  orderItem){
+		return  orderMapper.save(orderItem);
+	}
+
 
 	@Override
 	public Integer updateOrderStatus(Order order) {

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/GiftConditionServiceImpl.java

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.service.eo;
+import com.iamberry.wechat.core.entity.eo.GiftCondition;
+import com.iamberry.wechat.face.eo.GiftConditionService;
+import com.iamberry.wechat.service.mapper.GiftConditionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  赠品条件接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+@Service
+public class GiftConditionServiceImpl  implements GiftConditionService {
+    @Autowired
+    private GiftConditionMapper giftConditionMapper;
+    /**
+     * 获取集合
+     * @param  giftCondition
+     * @return List
+     */
+    @Override
+    public List<GiftCondition> getGiftConditionList(GiftCondition  giftCondition){
+        return  giftConditionMapper.getGiftConditionList(giftCondition);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftCondition
+     */
+    @Override
+    public  GiftCondition  getGiftConditionById(Integer  id){
+        return  giftConditionMapper.getGiftConditionById(id);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/GiftPoolServiceImpl.java

@@ -0,0 +1,58 @@
+package com.iamberry.wechat.service.eo;
+
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+import com.iamberry.wechat.face.eo.GiftPoolService;
+import com.iamberry.wechat.service.mapper.GiftPoolMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  赠品池接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+@Service
+public class GiftPoolServiceImpl  implements GiftPoolService {
+    @Autowired
+    private GiftPoolMapper giftPoolMapper;
+    /**
+     * 获取集合
+     * @param  giftPool
+     * @return List
+     */
+    @Override
+    public List<GiftPool> getGiftPoolList(GiftPool  giftPool){
+        return  giftPoolMapper.getGiftPoolList(giftPool);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftPool
+     */
+    @Override
+    public  GiftPool  getGiftPoolById(Integer  id){
+        return  giftPoolMapper.getGiftPoolById(id);
+    }
+    /**
+     * 修改数据
+     * @param  giftPool
+     * @return Integer
+     */
+    @Override
+    public  Integer  updateStock(GiftPool  giftPool){
+        return  giftPoolMapper.updateStock(giftPool);
+    }
+
+    /**
+     * 修改数据
+     * @param  giftPool
+     * @return Integer
+     */
+    @Override
+    public  Integer  updateAddStock(GiftPool  giftPool){
+        return  giftPoolMapper.updateAddStock(giftPool);
+    }
+
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/ItemGiftServiceImpl.java

@@ -0,0 +1,68 @@
+package com.iamberry.wechat.service.eo;
+
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+import com.iamberry.wechat.face.eo.ItemGiftService;
+import com.iamberry.wechat.service.mapper.ItemGiftMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  订单项关联赠品池接口
+ * @author Administrator
+ * @Date 2019-10-29
+ */
+@Service
+public class ItemGiftServiceImpl  implements ItemGiftService {
+    @Autowired
+    private ItemGiftMapper itemGiftMapper;
+    /**
+     * 获取集合
+     * @param  itemGift
+     * @return List
+     */
+    @Override
+    public List<ItemGift> getItemGiftList(ItemGift  itemGift){
+        return  itemGiftMapper.getItemGiftList(itemGift);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  itemGift
+     */
+    @Override
+    public ItemGift getItemGiftById(Integer  id){
+        return  itemGiftMapper.getItemGiftById(id);
+    }
+    /**
+     * 增加数据
+     * @param  itemGift
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ItemGift  itemGift){
+        return  itemGiftMapper.save(itemGift);
+    }
+    /**
+     * 修改数据
+     * @param  itemGift
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ItemGift  itemGift){
+        return  itemGiftMapper.update(itemGift);
+    }
+
+    /**
+     * 增加数据 <集合>
+     * @param  itemGiftList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<ItemGift>  itemGiftList){
+        return  itemGiftMapper.saveList(itemGiftList);
+    }
+
+
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/PromotionsServiceImpl.java

@@ -0,0 +1,71 @@
+package com.iamberry.wechat.service.eo;
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.SettlementGift;
+import com.iamberry.wechat.core.entity.eo.Spike;
+import com.iamberry.wechat.face.eo.PromotionsService;
+import com.iamberry.wechat.face.eo.SettlementGiftService;
+import com.iamberry.wechat.face.eo.SpikeService;
+import com.iamberry.wechat.service.mapper.PromotionsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  优惠活动接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+@Service
+public class PromotionsServiceImpl  implements PromotionsService {
+    @Autowired
+    private PromotionsMapper promotionsMapper;
+
+    @Autowired
+    private SettlementGiftService settlementGiftService;
+    @Autowired
+    private SpikeService spikeService;
+    /**
+     * 获取集合
+     * @param  promotions
+     * @return List
+     */
+    @Override
+    public List<Promotions> getPromotionsList(Promotions  promotions){
+        return  promotionsMapper.getPromotionsList(promotions);
+    }
+
+    @Override
+    public Promotions getPromotionsListByTime() {
+        Promotions promotions = new Promotions();
+        //获取当前时间所有活动
+        List<Promotions> promotionsList = promotionsMapper.getPromotionsListByTime();
+        int[] str = new int[promotionsList.size()];
+        for (int i = 0; i < promotionsList.size(); i++) {
+            str[i] = promotionsList.get(i).getPromotionsId();
+        }
+        if(str == null || str.length == 0){
+            return promotions;
+        }
+        //获取当前活动的所有满赠
+        List<SettlementGift> settlementGiftList = settlementGiftService.getSettlementGiftListAll(str);
+        promotions.setSettlementGiftList(settlementGiftList);
+
+        //获取当前活动所有秒杀
+        List<Spike> spikeList = spikeService.getSpikeListAll(str);
+        promotions.setSpikeList(spikeList);
+
+        //获取当前活动所有满减
+        return promotions;
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  promotions
+     */
+    @Override
+    public  Promotions  getPromotionsById(Integer  id){
+        return  promotionsMapper.getPromotionsById(id);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/SettlementGiftServiceImpl.java

@@ -0,0 +1,79 @@
+package com.iamberry.wechat.service.eo;
+
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.SettlementGift;
+import com.iamberry.wechat.face.eo.SettlementGiftService;
+import com.iamberry.wechat.service.mapper.SettlementGiftMapper;
+import org.apache.commons.collections.list.SynchronizedList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ *  结算赠品接口
+ * @author Administrator
+ * @Date 2019-05-23
+ */
+@Service
+public class SettlementGiftServiceImpl  implements SettlementGiftService {
+    @Autowired
+    private SettlementGiftMapper settlementGiftMapper;
+    /**
+     * 获取集合
+     * @param  settlementGift
+     * @return List
+     */
+    @Override
+    public List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift){
+        return  settlementGiftMapper.getSettlementGiftList(settlementGift);
+    }
+
+    @Override
+    public List<SettlementGift> getSettlementGiftListAll(int[] str) {
+
+        List<SettlementGift> settlementGiftList = settlementGiftMapper.getSettlementGiftListAll(str);
+//        for (Promotions pro:promotionsList) {
+//            SettlementGift settlementGift = new SettlementGift();
+//            settlementGift.setPromotionsId( pro.getPromotionsId());
+//            List<SettlementGift> settlementGiftPartList = settlementGiftMapper.getSettlementGiftListAll(settlementGift);
+//            for (SettlementGift sg:settlementGiftPartList){
+//                boolean flag = true;
+//                for (SettlementGift allsg:settlementGiftList) {
+//                    if(allsg.getSettGiftId() == sg.getSettGiftId()){
+//                        flag = false;
+//                    }
+//                }
+//                if(flag){
+//                    settlementGiftList.add(sg);
+//                }
+//            }
+//        }
+//        Collections.sort(settlementGiftList, new Comparator<SettlementGift>() {
+//            @Override
+//            public int compare(SettlementGift o1, SettlementGift o2) {
+//                // 按照学生的年龄进行升序排列
+//                if (o1.getSettGiftSort() > o2.getSettGiftSort()) {
+//                    return 1;
+//                }
+//                if (o1.getSettGiftSort() == o2.getSettGiftSort()) {
+//                    return 0;
+//                }
+//                return -1;
+//            }
+//        });
+
+        return  settlementGiftList;
+    }
+
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  settlementGift
+     */
+    @Override
+    public  SettlementGift  getSettlementGiftById(Integer  id){
+        return  settlementGiftMapper.getSettlementGiftById(id);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/SpikeServiceImpl.java

@@ -0,0 +1,46 @@
+package com.iamberry.wechat.service.eo;
+
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.Spike;
+import com.iamberry.wechat.face.eo.SpikeService;
+import com.iamberry.wechat.service.mapper.SpikeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  秒杀接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+@Service
+public class SpikeServiceImpl  implements SpikeService {
+    @Autowired
+    private SpikeMapper spikeMapper;
+    /**
+     * 获取集合
+     * @param  spike
+     * @return List
+     */
+    @Override
+    public List<Spike> getSpikeList(Spike  spike){
+        return  spikeMapper.getSpikeList(spike);
+    }
+
+    @Override
+    public List<Spike> getSpikeListAll(int[] str) {
+        return spikeMapper.getSpikeListAll(str);
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  spike
+     */
+    @Override
+    public  Spike  getSpikeById(Integer  id){
+        return  spikeMapper.getSpikeById(id);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/GiftConditionMapper.java

@@ -0,0 +1,25 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.eo.GiftCondition;
+
+import java.util.List;
+
+/**
+ *  赠品条件接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface GiftConditionMapper {
+    /**
+     * 获取集合
+     * @param  giftCondition
+     * @return List
+     */
+    List<GiftCondition> getGiftConditionList(GiftCondition  giftCondition);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftCondition
+     */
+    GiftCondition  getGiftConditionById(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/GiftPoolMapper.java

@@ -0,0 +1,39 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+
+import java.util.List;
+
+/**
+ *  赠品池接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface GiftPoolMapper {
+    /**
+     * 获取集合
+     * @param  giftPool
+     * @return List
+     */
+    List<GiftPool> getGiftPoolList(GiftPool  giftPool);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  giftPool
+     */
+    GiftPool  getGiftPoolById(Integer  id);
+
+    /**
+     * 修改数据
+     * @param  giftPool
+     * @return Integer
+     */
+    Integer  updateStock(GiftPool  giftPool);
+
+    /**
+     * 修改数据 - 增加库存
+     * @param  giftPool
+     * @return Integer
+     */
+    Integer  updateAddStock(GiftPool  giftPool);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ItemGiftMapper.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+
+import java.util.List;
+
+/**
+ *  订单项关联赠品池接口
+ * @author Administrator
+ * @Date 2019-10-29
+ */
+public interface ItemGiftMapper {
+    /**
+     * 获取集合
+     * @param  itemGift
+     * @return List
+     */
+    List<ItemGift> getItemGiftList(ItemGift  itemGift);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  itemGift
+     */
+    ItemGift  getItemGiftById(Integer  id);
+    /**
+     * 增加数据
+     * @param  itemGift
+     * @return Integer
+     */
+    Integer  save(ItemGift  itemGift);
+    /**
+     * 修改数据
+     * @param  itemGift
+     * @return Integer
+     */
+    Integer  update(ItemGift  itemGift);
+
+    /**
+     * 增加数据 <集合>
+     * @param  itemGiftList
+     * @return Integer
+     */
+    Integer  saveList(List<ItemGift>  itemGiftList);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/OrderMapper.java

@@ -21,6 +21,13 @@ public interface OrderMapper {
 	 * @return
 	 */
 	public Integer insertOrderItemList(List<OrderItem> items);
+
+	/**
+	 * 增加数据
+	 * @param  orderItem
+	 * @return Integer
+	 */
+	Integer  save(OrderItem  orderItem);
 	
 	/**
 	 * 修改订单信息

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/PromotionsMapper.java

@@ -0,0 +1,30 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.eo.Promotions;
+
+import java.util.List;
+
+/**
+ *  优惠活动接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface PromotionsMapper {
+    /**
+     * 获取集合
+     * @param  promotions
+     * @return List
+     */
+    List<Promotions> getPromotionsList(Promotions  promotions);
+    /**
+     * 获取集合
+     * @return List
+     */
+    List<Promotions> getPromotionsListByTime();
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  promotions
+     */
+    Promotions  getPromotionsById(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/SettlementGiftMapper.java

@@ -1,6 +1,6 @@
 package com.iamberry.wechat.service.mapper;
 
-import com.iamberry.wechat.core.entity.cart.SettlementGift;
+import com.iamberry.wechat.core.entity.eo.SettlementGift;
 
 import java.util.List;
 
@@ -16,22 +16,19 @@ public interface SettlementGiftMapper {
      * @return List
      */
     List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift);
+
+    /**
+     * 获取集合
+     * @param  str
+     * @return List
+     */
+    List<SettlementGift> getSettlementGiftListAll(int[] str);
+
     /**
      * 查询单条数据
      * @param  id
      * @return  settlementGift
      */
     SettlementGift  getSettlementGiftById(Integer  id);
-    /**
-     * 增加数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    Integer  save(SettlementGift  settlementGift);
-    /**
-     * 修改数据
-     * @param  settlementGift
-     * @return Integer
-     */
-    Integer  update(SettlementGift  settlementGift);
+
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/SpikeMapper.java

@@ -0,0 +1,32 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.eo.Spike;
+
+import java.util.List;
+
+/**
+ *  秒杀接口
+ * @author Administrator
+ * @Date 2019-10-21
+ */
+public interface SpikeMapper {
+    /**
+     * 获取集合
+     * @param  spike
+     * @return List
+     */
+    List<Spike> getSpikeList(Spike  spike);
+
+    /**
+     * 获取集合
+     * @param  str
+     * @return List
+     */
+    List<Spike> getSpikeListAll(int[] str);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  spike
+     */
+    Spike  getSpikeById(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -190,7 +190,7 @@ PUBLIC
 	
 	<!-- 根据orderId获取订单项数据 -->
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
-		SELECT I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice, 
+		SELECT I.item_id itemId, I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice,
 			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, C.COLOR_NAME productColor,
 			C.COLOR_69CODE produectRemark 
 		FROM 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -257,8 +257,8 @@ PUBLIC
 	<select id="selectCartItemByListId" parameterType="java.util.List" resultType="CartDto">
 		SELECT 
 			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus, 
-			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice, 
-			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark, 
+			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productDiscount,
+			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productPrice, PC.COLOR_69CODE productRemark,
 			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des,PC.color_img AS colorImg,G.product_is_spell AS productIsSpell,PC.color_spell_amount AS colorSpellAmount
 		FROM 
 			TB_IAMBERRY_SHOP_CART C 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/giftConditionMapper.xml

@@ -0,0 +1,38 @@
+<?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.iamberry.wechat.service.mapper.GiftConditionMapper">
+	<resultMap  id="BaseResultMap" type="GiftCondition" >
+		<result    column="gift_condition_id"    property="giftConditionId" />
+		<result    column="sett_gift_id"    property="settGiftId" />
+		<result    column="gift_condition_fill_color_id"    property="giftConditionFillColorId" />
+		<result    column="gift_condition_create_time"    property="giftConditionCreateTime" />
+	</resultMap>
+	<sql    id="Base_List" >
+		t.gift_condition_id,
+		t.sett_gift_id,
+		t.gift_condition_fill_color_id,
+		t.gift_condition_create_time
+	</sql>
+	<select id="getGiftConditionList" resultMap="BaseResultMap" parameterType="GiftCondition" >
+		select
+		<include refid="Base_List" />
+		from tb_iamberry_eo_gift_condition t
+		<where>
+			<if test="giftConditionId != null ">
+				AND t.gift_condition_id = #{giftConditionId}
+			</if >
+			<if test="settGiftId != null ">
+				AND t.sett_gift_id = #{settGiftId}
+			</if >
+			<if test="giftConditionFillColorId != null ">
+				AND t.gift_condition_fill_color_id = #{giftConditionFillColorId}
+			</if >
+		</where>
+	</select>
+	<select id="getGiftConditionById" resultMap="BaseResultMap" parameterType="Integer" >
+		select
+		<include refid="Base_List" />
+		from tb_iamberry_eo_gift_condition t
+		where t.gift_condition_id= #{giftConditionId}
+	</select>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/giftPoolMapper.xml

@@ -0,0 +1,85 @@
+<?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.iamberry.wechat.service.mapper.GiftPoolMapper">
+    <resultMap  id="BaseResultMap" type="GiftPool" >
+        <result    column="gift_pool_id"    property="giftPoolId" />
+        <result    column="sett_gift_id"    property="settGiftId" />
+        <result    column="gift_pool_color_id"    property="giftPoolColorId" />
+        <result    column="gift_pool_price"    property="giftPoolPrice" />
+        <result    column="gift_pool_num"    property="giftPoolNum" />
+        <result    column="gift_pool_status"    property="giftPoolStatus" />
+        <result    column="gift_pool_sort"    property="giftPoolSort" />
+        <result    column="gift_pool_stock"    property="giftPoolStock" />
+        <result    column="gift_pool_relation"    property="giftPoolRelation" />
+        <result    column="gift_pool_relation_desc"    property="giftPoolRelationDesc" />
+        <result    column="gift_pool_create_time"    property="giftPoolCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.gift_pool_id,
+        t.sett_gift_id,
+        t.gift_pool_color_id,
+        t.gift_pool_price,
+        t.gift_pool_num,
+        t.gift_pool_status,
+        t.gift_pool_sort,
+        t.gift_pool_stock,
+        t.gift_pool_relation,
+        t.gift_pool_relation_desc,
+        t.gift_pool_create_time
+    </sql>
+    <select id="getGiftPoolList" resultMap="BaseResultMap" parameterType="GiftPool" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_gift_pool t
+        <where>
+            <if test="giftPoolId != null ">
+                AND t.gift_pool_id = #{giftPoolId}
+            </if >
+            <if test="settGiftId != null ">
+                AND t.sett_gift_id = #{settGiftId}
+            </if >
+            <if test="giftPoolColorId != null ">
+                AND t.gift_pool_color_id = #{giftPoolColorId}
+            </if >
+            <if test="giftPoolPrice != null ">
+                AND t.gift_pool_price = #{giftPoolPrice}
+            </if >
+            <if test="giftPoolNum != null ">
+                AND t.gift_pool_num = #{giftPoolNum}
+            </if >
+            <if test="giftPoolStatus != null ">
+                AND t.gift_pool_status = #{giftPoolStatus}
+            </if >
+            <if test="giftPoolSort != null ">
+                AND t.gift_pool_sort = #{giftPoolSort}
+            </if >
+            <if test="giftPoolStock != null ">
+                AND t.gift_pool_stock = #{giftPoolStock}
+            </if >
+        </where>
+    </select>
+
+    <select id="getGiftPoolById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_gift_pool t
+        where t.gift_pool_id= #{giftPoolId}
+    </select>
+
+    <update id="updateStock" parameterType="GiftPool" >
+        update
+        tb_iamberry_eo_gift_pool
+        SET
+            gift_pool_stock = gift_pool_stock - #{giftPoolStock}
+        where gift_pool_id= #{giftPoolId}
+    </update>
+
+    <update id="updateAddStock" parameterType="GiftPool" >
+        update
+        tb_iamberry_eo_gift_pool
+        SET
+            gift_pool_stock = gift_pool_stock + #{giftPoolStock}
+        where gift_pool_id= #{giftPoolId}
+    </update>
+
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/itemGiftMapper.xml

@@ -0,0 +1,91 @@
+<?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.iamberry.wechat.service.mapper.ItemGiftMapper">
+    <resultMap  id="BaseResultMap" type="ItemGift" >
+        <result    column="item_gift_id"    property="itemGiftId" />
+        <result    column="item_id"    property="itemId" />
+        <result    column="gift_pool_id"    property="giftPoolId" />
+        <result    column="item_gift_num"    property="itemGiftNum" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.item_gift_id,
+        t.item_id,
+        t.gift_pool_id,
+        t.item_gift_num
+    </sql>
+    <select id="getItemGiftList" resultMap="BaseResultMap" parameterType="ItemGift" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_item_gift t
+        <where>
+            <if test="itemGiftId != null ">
+                AND t.item_gift_id = #{itemGiftId}
+            </if >
+            <if test="itemId != null ">
+                AND t.item_id = #{itemId}
+            </if >
+            <if test="giftPoolId != null ">
+                AND t.gift_pool_id = #{giftPoolId}
+            </if >
+            <if test="itemGiftNum != null ">
+                AND t.item_gift_num = #{itemGiftNum}
+            </if >
+        </where>
+    </select>
+    <select id="getItemGiftById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_item_gift t
+        where t.item_gift_id= #{itemGiftId}
+    </select>
+    <insert id="save" parameterType="ItemGift" >
+        insert into
+        tb_iamberry_eo_item_gift
+        (
+        item_id,
+        gift_pool_id,
+        item_gift_num
+        )
+        values
+        (
+        #{itemId},
+        #{giftPoolId},
+        #{itemGiftNum}
+        )
+    </insert>
+    <update id="update" parameterType="ItemGift" >
+        update
+        tb_iamberry_eo_item_gift
+        <set >
+            <if test="itemId != null ">
+                item_id = #{itemId},
+            </if >
+            <if test="giftPoolId != null ">
+                gift_pool_id = #{giftPoolId},
+            </if >
+            <if test="itemGiftNum != null ">
+                item_gift_num = #{itemGiftNum}
+            </if >
+        </set >
+        where item_gift_id= #{itemGiftId}
+    </update>
+
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_iamberry_eo_item_gift
+        (
+        item_id,
+        gift_pool_id,
+        item_gift_num
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.itemId},
+            #{node.giftPoolId},
+            #{node.itemGiftNum}
+            )
+        </foreach >
+    </insert>
+
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/orderMapper.xml

@@ -63,6 +63,40 @@ PUBLIC
 				)
 	        </foreach>
 	</insert>
+
+	<insert id="save" parameterType="OrderItem" keyProperty="itemId" useGeneratedKeys="true">
+		insert into
+		tb_iamberry_shop_order_item
+		(
+		item_id,
+		item_sales_orderid,
+		item_product_id,
+		item_color_id,
+		item_num,
+		item_total,
+		item_create_date,
+		item_product_name,
+		item_product_discount,
+		item_product_price,
+		item_product_pic,
+		item_product_type
+		)
+		values
+		(
+		#{itemId},
+		#{itemSalesOrderid},
+		#{itemProductId},
+		#{itemColorId},
+		#{itemNum},
+		#{itemTotal},
+		NOW(),
+		#{itemProductName},
+		#{itemProductDiscount},
+		#{itemProductPrice},
+		#{itemProductPic},
+		#{itemProductType}
+		)
+	</insert>
 	
 	<!-- 修改订单信息 -->
 	<update id="updateOrderStatus" parameterType="Order">

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -32,10 +32,14 @@
 		COLOR_69CODE color69Code,
 		color_spell_amount colorSpellAmount
 	</sql>
-	
+
+	<resultMap  id="ProductMap" type="Product" >
+		<result  column="productId"    property="productId" />
+		<collection property="colorList" column="productId" ofType="ProductColor" select="selectProductColorList"/>
+	</resultMap>
 	<!-- 分页查询商品信息 -->
-	<select id="selectPageProduct" parameterType="Product" resultType="Product">
-		SELECT 
+	<select id="selectPageProduct" resultMap="ProductMap" parameterType="Product">
+		SELECT
 			<include refid="product" />,
 			COLOR_DISCOUNT productDiscount,
 			COLOR_PRICE productPrice, 
@@ -69,6 +73,23 @@
 		     	LIMIT ${page.recordBegin},${page.pageSize}
 		    </if>
 	</select>
+	<select id="selectProductColorList" parameterType="ProductColor" resultType="ProductColor">
+		SELECT
+			t.color_id,
+			t.color_product_id,
+			t.color_name,
+			t.color_discount,
+			t.color_price,
+			t.color_cretae_time,
+			t.color_update_time,
+			t.color_69code,
+			t.color_sort,
+			t.color_img,
+			t.color_status,
+			t.color_spell_amount
+		FROM tb_iamberry_product_color t
+		WHERE t.color_product_id = #{colorProductId}
+	</select>
 	
 	<!-- 根据条件查询产品集合 -->
 	<select id="listSelectProduct" parameterType="Product" resultType="Product">

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/promotionsMapper.xml

@@ -0,0 +1,65 @@
+<?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.iamberry.wechat.service.mapper.PromotionsMapper">
+    <resultMap  id="BaseResultMap" type="Promotions" >
+        <result    column="promotions_id"    property="promotionsId" />
+        <result    column="promotions_name"    property="promotionsName" />
+        <result    column="promotions_type"    property="promotionsType" />
+        <result    column="promotions_status"    property="promotionsStatus" />
+        <result    column="promotions_begin_time"    property="promotionsBeginTime" />
+        <result    column="promotions_end_time"    property="promotionsEndTime" />
+        <result    column="promotions_desc"    property="promotionsDesc" />
+        <result    column="promotions_create_time"    property="promotionsCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.promotions_id,
+        t.promotions_name,
+        t.promotions_type,
+        t.promotions_status,
+        t.promotions_begin_time,
+        t.promotions_end_time,
+        t.promotions_desc,
+        t.promotions_create_time
+    </sql>
+    <select id="getPromotionsList" resultMap="BaseResultMap" parameterType="Promotions" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_promotions t
+        <where>
+            <if test="promotionsId != null ">
+                AND t.promotions_id = #{promotionsId}
+            </if >
+            <if test="promotionsName != null and promotionsName != ''">
+                AND t.promotions_name  like  CONCAT ('%',#{promotionsName},'%')
+            </if >
+            <if test="promotionsType != null ">
+                AND t.promotions_type = #{promotionsType}
+            </if >
+            <if test="promotionsStatus != null ">
+                AND t.promotions_status = #{promotionsStatus}
+            </if >
+            <if test="promotionsDesc != null and promotionsDesc != ''">
+                AND t.promotions_desc  like  CONCAT ('%',#{promotionsDesc},'%')
+            </if >
+        </where>
+    </select>
+    <select id="getPromotionsListByTime" resultMap="BaseResultMap" parameterType="Promotions" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_promotions t
+        <where>
+            AND t.promotions_status = 1
+            AND t.promotions_begin_time <![CDATA[ <= ]]> NOW()
+            AND t.promotions_end_time <![CDATA[ >= ]]> NOW()
+            <if test="promotionsType != null ">
+                AND t.promotions_type = #{promotionsType}
+            </if >
+        </where>
+    </select>
+    <select id="getPromotionsById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_promotions t
+        where t.promotions_id= #{promotionsId}
+    </select>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/settlementGiftMapper.xml

@@ -3,94 +3,95 @@
 <mapper namespace="com.iamberry.wechat.service.mapper.SettlementGiftMapper">
     <resultMap  id="BaseResultMap" type="SettlementGift" >
         <result    column="sett_gift_id"    property="settGiftId" />
-        <result    column="sett_gift_fill_color_id"    property="settGiftFillColorId" />
-        <result    column="sett_gift_gift_color_id"    property="settGiftGiftColorId" />
-        <result    column="sett_gift_price"    property="settGiftPrice" />
-        <result    column="sett_gift_num"    property="settGiftNum" />
+        <result    column="promotions_id"    property="promotionsId" />
         <result    column="sett_gift_status"    property="settGiftStatus" />
+        <result    column="sett_gift_desc"    property="settGiftDesc" />
         <result    column="sett_gift_create_time"    property="settGiftCreateTime" />
     </resultMap>
     <sql    id="Base_List" >
         t.sett_gift_id,
-        t.sett_gift_fill_color_id,
-        t.sett_gift_gift_color_id,
-        t.sett_gift_price,
-        t.sett_gift_num,
+        t.promotions_id,
         t.sett_gift_status,
+        t.sett_gift_desc,
+        t.sett_gift_sort,
         t.sett_gift_create_time
     </sql>
     <select id="getSettlementGiftList" resultMap="BaseResultMap" parameterType="SettlementGift" >
         select
         <include refid="Base_List" />
-        from tb_iamberry_settlement_gift t
+        from tb_iamberry_eo_settlement_gift t
         <where>
             <if test="settGiftId != null ">
                 AND t.sett_gift_id = #{settGiftId}
             </if >
-            <if test="settGiftFillColorId != null ">
-                AND t.sett_gift_fill_color_id = #{settGiftFillColorId}
-            </if >
-            <if test="settGiftGiftColorId != null ">
-                AND t.sett_gift_gift_color_id = #{settGiftGiftColorId}
-            </if >
-            <if test="settGiftPrice != null ">
-                AND t.sett_gift_price = #{settGiftPrice}
-            </if >
-            <if test="settGiftNum != null ">
-                AND t.sett_gift_num = #{settGiftNum}
+            <if test="promotionsId != null ">
+                AND t.promotions_id = #{promotionsId}
             </if >
             <if test="settGiftStatus != null ">
                 AND t.sett_gift_status = #{settGiftStatus}
             </if >
         </where>
     </select>
+
+    <resultMap  id="BaseResultAllMap" type="SettlementGift" >
+        <result    column="sett_gift_id"    property="settGiftId" />
+        <result    column="promotions_id"    property="promotionsId" />
+        <result    column="sett_gift_status"    property="settGiftStatus" />
+        <result    column="sett_gift_desc"    property="settGiftDesc" />
+        <result    column="sett_gift_sort"    property="settGiftSort" />
+        <result    column="sett_gift_create_time"    property="settGiftCreateTime" />
+        <collection property="giftConditionList" column="sett_gift_id" ofType="GiftCondition" select="listGiftCondition"/>
+        <collection property="giftPoolList" column="sett_gift_id" ofType="GiftPool" select="listGiftPool"/>
+    </resultMap>
+    <select id="getSettlementGiftListAll" resultMap="BaseResultAllMap" parameterType="java.util.List" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_settlement_gift t
+        <where>
+            AND t.promotions_id IN (
+                <foreach collection="array" item="item" separator=",">
+                    #{item}
+                </foreach>
+            )
+            AND t.sett_gift_status = 1
+        </where>
+        ORDER BY t.sett_gift_sort
+    </select>
+
+    <select id="listGiftCondition" resultType="GiftCondition" parameterType="GiftCondition" >
+        select
+            t.gift_condition_id,
+            t.sett_gift_id,
+            t.gift_condition_fill_color_id,
+            t.gift_condition_create_time
+        from tb_iamberry_eo_gift_condition t
+        WHERE t.sett_gift_id = #{settGiftId}
+    </select>
+
+    <select id="listGiftPool" resultType="GiftPool" parameterType="GiftPool" >
+        select
+            t.gift_pool_id,
+            t.sett_gift_id,
+            t.gift_pool_color_id,
+            t.gift_pool_price,
+            t.gift_pool_num,
+            t.gift_pool_status,
+            t.gift_pool_sort,
+            t.gift_pool_stock,
+            t.gift_pool_relation,
+            t.gift_pool_relation_desc,
+            t.gift_pool_create_time
+        from tb_iamberry_eo_gift_pool t
+        WHERE t.sett_gift_id = #{settGiftId}
+        AND t.gift_pool_status = 1
+        AND t.gift_pool_stock > 0
+        ORDER BY t.gift_pool_sort
+    </select>
+
     <select id="getSettlementGiftById" resultMap="BaseResultMap" parameterType="Integer" >
         select
         <include refid="Base_List" />
-        from tb_iamberry_settlement_gift t
+        from tb_iamberry_eo_settlement_gift t
         where t.sett_gift_id= #{settGiftId}
     </select>
-    <insert id="save" parameterType="SettlementGift" >
-        insert into
-        tb_iamberry_settlement_gift
-        (
-        sett_gift_id,
-        sett_gift_fill_color_id,
-        sett_gift_gift_color_id,
-        sett_gift_price,
-        sett_gift_num,
-        sett_gift_status
-        )
-        values
-        (
-        #{settGiftId},
-        #{settGiftFillColorId},
-        #{settGiftGiftColorId},
-        #{settGiftPrice},
-        #{settGiftNum},
-        #{settGiftStatus}
-        )
-    </insert>
-    <update id="update" parameterType="SettlementGift" >
-        update
-        tb_iamberry_settlement_gift
-        <set >
-            <if test="settGiftFillColorId != null ">
-                sett_gift_fill_color_id = #{settGiftFillColorId},
-            </if >
-            <if test="settGiftGiftColorId != null ">
-                sett_gift_gift_color_id = #{settGiftGiftColorId},
-            </if >
-            <if test="settGiftPrice != null ">
-                sett_gift_price = #{settGiftPrice},
-            </if >
-            <if test="settGiftNum != null ">
-                sett_gift_num = #{settGiftNum},
-            </if >
-            <if test="settGiftStatus != null ">
-                sett_gift_status = #{settGiftStatus},
-            </if >
-        </set >
-        where sett_gift_id= #{settGiftId}
-    </update>
 </mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/spikeMapper.xml

@@ -0,0 +1,63 @@
+<?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.iamberry.wechat.service.mapper.SpikeMapper">
+    <resultMap  id="BaseResultMap" type="Spike" >
+        <result    column="spike_id"    property="spikeId" />
+        <result    column="promotions_id"    property="promotionsId" />
+        <result    column="spike_color_id"    property="spikeColorId" />
+        <result    column="spike_price"    property="spikePrice" />
+        <result    column="spike_discount"    property="spikeDiscount" />
+        <result    column="spike_status"    property="spikeStatus" />
+        <result    column="spike_create_time"    property="spikeCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.spike_id,
+        t.promotions_id,
+        t.spike_color_id,
+        t.spike_price,
+        t.spike_discount,
+        t.spike_status,
+        t.spike_create_time
+    </sql>
+    <select id="getSpikeList" resultMap="BaseResultMap" parameterType="Spike" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_spike t
+        <where>
+            <if test="spikeId != null ">
+                AND t.spike_id = #{spikeId}
+            </if >
+            <if test="promotionsId != null ">
+                AND t.promotions_id = #{promotionsId}
+            </if >
+            <if test="spikeColorId != null ">
+                AND t.spike_color_id = #{spikeColorId}
+            </if >
+            <if test="spikeDiscount != null and spikeDiscount != ''">
+                AND t.spike_discount  like  CONCAT ('%',#{spikeDiscount},'%')
+            </if >
+            <if test="spikeStatus != null">
+                AND t.spike_status  = #{spikeStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getSpikeListAll" resultMap="BaseResultMap" parameterType="java.util.List" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_spike t
+        <where>
+            t.spike_status  = 1
+            AND t.promotions_id IN (
+                <foreach collection="array" item="item" separator=",">
+                    #{item}
+                </foreach>
+            )
+        </where>
+    </select>
+    <select id="getSpikeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_eo_spike t
+        where t.spike_id= #{spikeId}
+    </select>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -477,7 +477,7 @@ public class WeChatServiceImpl implements WeChatService {
 	 * @return
 	 */
 	public String addFullReduction(String fromUserName) {
-		ActivityDate activityDate = activityUtil.isActivity();
+		ActivityDate activityDate = activityUtil.getActivityDate();
 		if(activityDate.isStatus()){
 			if (fromUserName == null) {
 				return NameUtils.getConfig("FEMALE_LADY_ERROR");

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -7,9 +7,15 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.iamberry.wechat.core.entity.coupon.Exchange;
 import com.iamberry.wechat.core.entity.coupon.ExchangeItem;
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+import com.iamberry.wechat.core.entity.eo.ItemGift;
 import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.coupon.ExchangeService;
+import com.iamberry.wechat.face.eo.GiftPoolService;
+import com.iamberry.wechat.face.eo.ItemGiftService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
+import com.iamberry.wechat.service.ActivityUtil;
+import com.iamberry.wechat.service.eo.ItemGiftServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -75,9 +81,14 @@ public class CartHandlers {
 	private ProductInfoService productInfoService;
 	@Autowired
 	private ProductColorService productColorService;
-
 	@Autowired
 	ExchangeService exchangeService;
+	@Autowired
+	GiftPoolService giftPoolService;
+	@Autowired
+	ItemGiftService itemGiftService;
+	@Autowired
+	private ActivityUtil activityUtil;
 	
 	/**
 	 * 进入购物车页面
@@ -111,52 +122,16 @@ public class CartHandlers {
 				remsg.setMessage(ResultInfo.loginOutError);
 				return remsg;
 			}
-			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-			if (user.getUserDealers() != null && user.getTemplateId() != null
-					&& templateId == user.getTemplateId().intValue()  && user.getUserResType().intValue() == 3) {
-				//若果是金牌会员下线，产品的价格就以优惠价显示
-				for (CartDto cartDto : cartList) {
-					UserGiftDto userGiftDto = new UserGiftDto();
-					userGiftDto.setUserLevel(2);
-					userGiftDto.setUserProductId(cartDto.getCartProductId());
-					userGiftDto.setUserColorId(cartDto.getCartColorId());
-					//根据商品id和会员等级查询礼品信息
-					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-					if (userGiftDto != null) {
-						cartDto.setProductDiscount(userGiftDto.getUserDiscount());
-					}
-				}
-			}
-			
-			//根据openid查询该用户是否购买过订单
-			ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-			shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-			shopSalesOrderDto.setSalesStatus("2");
-			int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
-			
+
+			activityUtil.getColorSpike(cartList);
+
 			for (CartDto cartDto : cartList) {
-				
-				//如果购买过订单，则滤芯的价格可按折扣价购买
-//				if (orderNum > 0) {
-//					if (cartDto.getProductType().intValue() == 2) {
-//						UserGiftDto userGiftDto = new UserGiftDto();
-//						userGiftDto.setUserLevel(3);
-//						userGiftDto.setUserProductId(cartDto.getCartProductId());
-//						userGiftDto.setUserColorId(cartDto.getCartColorId());
-//						//根据商品id和会员等级查询礼品信息
-//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//						if (userGiftDto != null) {
-//							cartDto.setProductDiscount(userGiftDto.getUserDiscount());
-//						}
-//					}
-//				}
-				
 				if (cartDto.getProductStatus() != null && cartDto.getProductStatus() == 1) { 	// 产品状态:在售
 					total += cartDto.getCartNum() * cartDto.getProductDiscount();
 				}
 			}
 		}
-		
+
 		/*
 		 * 组装数据
 		 */
@@ -691,6 +666,21 @@ public class CartHandlers {
 			order.setSalesOrderid(orderId);
 			order.setOldStatus(status);
 			adminOrderService.updateOrderStatusByOrderId(order);
+
+			//恢复赠品的库存
+			List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+			for (OrderItem orderItem:orderItemList) {
+				ItemGift itemGift = new ItemGift();
+				itemGift.setItemId(orderItem.getItemId());
+				List<ItemGift> itemGiftList = itemGiftService.getItemGiftList(itemGift);
+				for (ItemGift ig:itemGiftList) {
+					GiftPool gp = new GiftPool();
+					gp.setGiftPoolId(ig.getGiftPoolId());
+					gp.setGiftPoolStock(ig.getItemGiftNum());
+					giftPoolService.updateAddStock(gp);
+				}
+			}
+
 			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 			remsg.setResultCode(ResultInfo.SUCCESSCODE);
 			remsg.setStatus(true);

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -11,8 +11,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.iamberry.redis.RedisUtils;
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.Spike;
 import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.face.porduct.IndexProductService;
+import com.iamberry.wechat.service.ActivityUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -66,6 +69,9 @@ public class ProductInfoHandler {
 	@Autowired
 	private IndexProductService indexProductService;
 
+	@Autowired
+	private ActivityUtil activityUtil;
+
 	/**
 	 * 首页进入商城
 	 * @param request
@@ -95,62 +101,22 @@ public class ProductInfoHandler {
 		product.getPage().setPageSize(pageSize);
 		product.getPage().initRecordBegin();
 		List<Product> productList = productInfoService.selectPageProduct(product);
+		Promotions promotions = activityUtil.getAllPromotions();
+		if(promotions != null){
+			for (Product pc:productList) {
+				for (ProductColor color : pc.getColorList()) {
+					for (Spike spike:promotions.getSpikeList()) {
+						if(spike.getSpikeColorId() == color.getColorId()){
+							pc.setProductPrice(spike.getSpikePrice());
+							pc.setProductDiscount(spike.getSpikeDiscount());
+							color.setColorDiscount(spike.getSpikeDiscount());
+							color.setColorPrice(spike.getSpikePrice());
+						}
+					}
+				}
+			}
+		}
 
-
-		//根据openid查询该用户是否购买过订单
-//		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-//		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-//		shopSalesOrderDto.setSalesStatus("2");
-//
-//		//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
-//		//查询金牌会员模板id
-//		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-//		//查询用户信息
-//		Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
-//		if (user == null) {
-//			remsg.setMessage(ResultInfo.loginOutError);
-//			remsg.setStatus(false);
-//			remsg.setMessage(ResultInfo.loginOutError);
-//			return remsg;
-//		}
-//		//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-//		if (user.getUserDealers() != null && user.getTemplateId() != null &&
-//				templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
-//			//若果是金牌会员下线，产品的价格就以优惠价显示
-//			if (productList != null && productList.size() >= 1) {
-//				for (Product productInfo : productList) {
-//					UserGiftDto userGiftDto = new UserGiftDto();
-//					userGiftDto.setUserLevel(2);
-//					userGiftDto.setUserProductId(productInfo.getProductId());
-//					userGiftDto.setUserColorId(productInfo.getColorId());
-//					//根据商品id和会员等级查询礼品信息
-//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//					if (userGiftDto != null) {
-//						productInfo.setProductDiscount(userGiftDto.getUserDiscount());
-//					}
-//				}
-//			}
-//		}
-//
-//		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
-//		//如果购买过订单，则滤芯的价格可按折扣价购买
-//		if (orderNum > 0) {
-//			if (productList != null && productList.size() >= 1) {
-//				for (Product productInfo : productList) {
-//					if (productInfo.getProductType().getTypeId().intValue() == 2) {
-//						UserGiftDto userGiftDto = new UserGiftDto();
-//						userGiftDto.setUserLevel(3);
-//						userGiftDto.setUserProductId(productInfo.getProductId());
-//						userGiftDto.setUserColorId(productInfo.getColorId());
-//						//根据商品id和会员等级查询礼品信息
-//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//						if (userGiftDto != null) {
-//							productInfo.setProductDiscount(userGiftDto.getUserDiscount());
-//						}
-//					}
-//				}
-//			}
-//		}
 		int num = this.productInfoService.selectProductCount(product);
 		int count = num % pageSize == 0? num/pageSize:(num/pageSize)+1;
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -233,52 +199,12 @@ public class ProductInfoHandler {
 		
 		if (StaticInfo.pattern.matcher(productId).find()) {
 			Product product = this.productInfoService.getProductByProductId(Integer.parseInt(productId),colorId);
-			
-//			//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
-//			//查询金牌会员模板id
-//			int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-//			//查询用户信息
-//			Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
-//			if (user == null) {
-//				remsg.setMessage(ResultInfo.loginOutError);
-//				remsg.setStatus(false);
-//				remsg.setMessage(ResultInfo.loginOutError);
-//				return remsg;
-//			}
-			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-//			if (user.getUserDealers() != null && user.getTemplateId() != null
-//					&& templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
-//						//若果是金牌会员下线，产品的价格就以优惠价显示
-//						UserGiftDto userGiftDto = new UserGiftDto();
-//						userGiftDto.setUserLevel(2);
-//						userGiftDto.setUserProductId(product.getProductId());
-//						userGiftDto.setUserColorId(product.getColorId());
-//						//根据商品id和会员等级查询礼品信息
-//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//						if (userGiftDto != null) {
-//							product.setProductDiscount(userGiftDto.getUserDiscount());
-//						}
-//			}
-			
+
 			//根据openid查询该用户是否购买过订单
 			ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
 			shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
 			shopSalesOrderDto.setSalesStatus("2");
-			//如果购买过订单，则滤芯的价格可按折扣价购买
-//			if (product != null) {
-//				if (product.getProductType().getTypeId().intValue() == 2) {
-//					//若果是金牌会员下线，产品的价格就以优惠价显示
-//					UserGiftDto userGiftDto = new UserGiftDto();
-//					userGiftDto.setUserLevel(3);
-//					userGiftDto.setUserProductId(product.getProductId());
-//					userGiftDto.setUserColorId(product.getColorId());
-//					//根据商品id和会员等级查询礼品信息
-//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//					if (userGiftDto != null) {
-//						product.setProductDiscount(userGiftDto.getUserDiscount());
-//					}
-//				}
-//			}
+
 			List<ProductPicture> pictureList = productPictureService.getProductPictureByproductId(Integer.parseInt(productId));
 			product.setPictureList(pictureList);
 
@@ -286,6 +212,12 @@ public class ProductInfoHandler {
 			productColor.setColorStatus(1);
 			productColor.setColorProductId(product.getProductId());
 			List<ProductColor> colorList = productColorService.selectProductColorList(productColor);
+			activityUtil.getColorSpike(colorList);
+
+			if(colorList != null && colorList.size()>0){
+				product.setProductPrice(colorList.get(0).getColorPrice());
+				product.setProductDiscount(colorList.get(0).getColorDiscount());
+			}
 
 			/*
 			 * 组装数据

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -1,17 +1,13 @@
 package com.iamberry.wechat.handles.coupon;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.dubbo.remoting.exchange.ExchangeServer;
 import com.iamberry.wechat.core.entity.coupon.Exchange;
 import com.iamberry.wechat.face.coupon.ExchangeService;
+import com.iamberry.wechat.tools.StrUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -531,4 +527,59 @@ public class CouponTypeHandler {
 		}
 		return rm;
 	}
+
+	/**
+	 * 用户领取优惠券接口
+	 * @return
+	 */
+	@RequestMapping("/receive_coupon_end")
+	@ResponseBody
+	public ResultMsg myReceiveCouponEnd(HttpServletRequest req,@RequestParam(value = "couponId", required = false) Integer couponId) {
+		ResultMsg rm = new ResultMsg();
+		Member member = WechatUtils.getUserBySession(req);
+		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+
+		CouponType couponType = couponTypeService.getCouponTypeById(couponId);
+		Date date = new Date();
+		if(!date.before(couponType.getCouponEndDate())){
+			rm.setStatus(false);
+			rm.setMessage("该券已过期！");
+			return rm;
+		}
+
+		CouponItemDto couponItemDto = new CouponItemDto();
+		couponItemDto.setUseropenid(member.getUserOpenid());
+		couponItemDto.setCouponId(couponId);
+		List<CouponItemDto> couponItemDtoList = couponItemService.getCouponItemDtoList(couponItemDto);
+		if(couponItemDtoList != null && couponItemDtoList.size() >= couponType.getCouponGetLimit()){
+			rm.setStatus(false);
+			rm.setMessage("已经领取过该优惠券了！");
+			return rm;
+		}
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(2019,10,11,23,59,57);
+		synchronized (lock) {
+			//创建优惠券
+			CouponItem couponItem = new CouponItem();
+			String uuidStr = StrUtils.getUUID();
+			couponItem.setCouponItemId(uuidStr);
+			couponItem.setCouponItemUseropenid(member.getUserOpenid());
+			couponItem.setCouponId(couponType.getCouponId());
+			couponItem.setCouponReceiveDate(new Date());
+			couponItem.setCouponUseEndDate(calendar.getTime());
+			couponItem.setCouponUseStatus(1);
+			couponItem.setCouponItemRemark(couponType.getCouponRemark());
+			Integer flag = couponItemService.insertCouponItem(couponItem);
+			if(flag < 1){
+				rm.setStatus(false);
+				rm.setMessage("领取优惠券失败！");
+				return rm;
+			}else{
+				rm.setStatus(false);
+				rm.setMessage("领取成功！");
+				return rm;
+			}
+		}
+	}
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/home/HomeHandler.java

@@ -14,7 +14,11 @@ import com.iamberry.wechat.face.home.HomeService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.WeixinUtil;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +27,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -39,6 +45,7 @@ import java.util.Map;
 @Controller
 @RequestMapping("/wechat")
 public class HomeHandler {
+	private Logger logger = LoggerFactory.getLogger(HomeHandler.class);
 
 	@Autowired
 	private HomeService homeService;
@@ -89,6 +96,31 @@ public class HomeHandler {
 	@RequestMapping(value = "/indexData", method = RequestMethod.POST)
 	public ResultMsg indexData(HttpServletRequest request) throws Exception {
 		ResultMsg msg = new ResultMsg();
+
+		Member m = WechatUtils.getUserBySession(request);
+		m = memberService.getMemberByUserOpenId(m.getUserOpenid());
+		try{
+			if(m.getUserHead() == null || "".equals(m.getUserHead())){
+				JSONObject jsonObject = WeixinUtil.getUserInfo(m.getUserOpenid());
+				String nickname = jsonObject.getString("nickname");
+				String headimgurl = jsonObject.getString("headimgurl");
+				try {
+					nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
+				} catch (UnsupportedEncodingException e) {
+					nickname = "";
+				}
+				m.setUserHead(headimgurl);
+				m.setUserNickname(nickname);
+				if(nickname != null && !"".equals(nickname)){
+					m.setUserStatus(2);
+				}
+				homeService.updateWechatMemberInfoByByOpenid(m);
+			}
+		}catch (Exception e){
+			logger.info("获取个人信息失败；openid："+m.getUserOpenid());
+			e.printStackTrace();
+		}
+
 		Member member =  WechatUtils.getUserBySession(request);
 		// 准备数据
 		Map<String, Object> returnMap = new HashMap<String, Object>();

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -7,6 +7,8 @@ import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.cart.*;
 import com.iamberry.wechat.core.entity.coupon.*;
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.eo.SettlementGift;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.mq.MQMessage;
 import com.iamberry.wechat.core.entity.order.Order;
@@ -17,14 +19,13 @@ import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.cart.CartService;
 import com.iamberry.wechat.face.cart.ProductInfoService;
-import com.iamberry.wechat.face.cart.SettlementGiftService;
+import com.iamberry.wechat.face.eo.SettlementGiftService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
 import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.home.HomeService;
 import com.iamberry.wechat.face.member.CashLogService;
 import com.iamberry.wechat.face.member.MemberService;
-import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.pay.PayService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.face.qrcode.TemporaryQrcodeService;
@@ -36,6 +37,7 @@ import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.OrderNOUtil;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.ValidatorUtil;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -162,36 +164,9 @@ public class OrderHandler {
 			msg.setMessage(ResultInfo.cartEmptyError);
 			return msg;
 		}
-		
-		//根据openid查询该用户是否购买过订单
-//		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-//		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-//		shopSalesOrderDto.setSalesStatus("2");
-//		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
-		//如果购买过订单，则滤芯的价格可按折扣价购买
-//		if (orderNum > 0) {
-//			if (cartDtos != null && cartDtos.size() >= 1) {
-//				for (CartDto cartDto : cartDtos) {
-//					if (cartDto.getProductType().intValue() == 2) {
-//						UserGiftDto userGiftDto = new UserGiftDto();
-//						userGiftDto.setUserLevel(3);
-//						userGiftDto.setUserProductId(cartDto.getCartProductId());
-//						userGiftDto.setUserColorId(cartDto.getCartColorId());
-//						//根据商品id和会员等级查询礼品信息
-//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//						if (userGiftDto != null) {
-//							cartDto.setProductPrice(userGiftDto.getUserDiscount());
-//						}
-//					}
-//				}
-//			}
-//		}
 
 		//添加赠品
-		ActivityDate activityDate = activityUtil.isActivity();
-		if(activityDate.isStatus()){
-			giftCart(cartDtos);
-		}
+		activityUtil.preferential(cartDtos);
 
 		// 判断当前提交的购物车ID，有多少产品在售
 		int total = 0; // 支付金额
@@ -201,17 +176,15 @@ public class OrderHandler {
 		//获取是否是拼团订单字段 1是 2否
 		String isSpell = request.getParameter("isSpell");
 		for (CartDto cartDto : cartDtos) {
-			int subTotal = cartDto.getProductPrice();
+			int subTotal = cartDto.getProductDiscount();
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				if (isSpell != null && isSpell.equals("1")) {
-						//是否可拼团
-
-						if(cartDto.getProductIsSpell() != null && cartDto.getProductIsSpell().intValue() == 2){
-							subTotal = cartDto.getColorSpellAmount(); // 小计 拼团价
-						}else{
-							subTotal = cartDto.getProductPrice(); // 小计 正常价
-						}
-
+					//是否可拼团
+					if(cartDto.getProductIsSpell() != null && cartDto.getProductIsSpell().intValue() == 2){
+						subTotal = cartDto.getColorSpellAmount(); // 小计 拼团价
+					}else{
+						subTotal = cartDto.getProductDiscount(); // 小计 正常价
+					}
 				}
 			}
 			total += cartDto.getCartNum() * subTotal;
@@ -411,9 +384,6 @@ public class OrderHandler {
 		
 		int total = 0; // 需要支付的总额, 单位为分
 
-		//查询金牌会员模板id
-		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-		UserGiftDto userGift = null;
 		//vip会员买年套滤芯减价，此表示为减价金额
 		int priceReduction = 0;
 
@@ -426,24 +396,10 @@ public class OrderHandler {
 		List<OrderItem> list = new ArrayList<OrderItem>();
 		List<Integer> cartIds = new ArrayList<Integer>();
 
-
-
 		//添加赠品
-		ActivityDate activityDate = activityUtil.isActivity();
-		if(activityDate.isStatus()){
-			giftCart(cartDtos);
-		}
-		
+		activityUtil.preferential(cartDtos);
+
 		for (CartDto cartDto : cartDtos) {
-			//如果购买过订单，则滤芯的价格可按折扣价购买
-//			if (orderNum > 0) {
-//				if (cartDto.getProductType().intValue() == 2) {
-//					UserGiftDto userGiftDto = new UserGiftDto();
-//					userGiftDto.setUserLevel(3);
-//					userGiftDto.setUserProductId(cartDto.getCartProductId());
-//					userGiftDto.setUserColorId(cartDto.getCartColorId());
-//				}
-//			}
 			//VIP用户滤芯年套减一百
 			if(cartDto.getCartColorId() == 5 && member.getUserIsVip() == 2){
 				priceReduction += 10000*cartDto.getCartNum();
@@ -461,23 +417,24 @@ public class OrderHandler {
 					if(cartDto.getProductIsSpell().intValue() == 2){
 						subTotal = cartDto.getCartNum() * cartDto.getColorSpellAmount(); // 小计 拼团价
 					}else{
-						subTotal = cartDto.getCartNum() * cartDto.getProductPrice(); // 小计 正常价
+						subTotal = cartDto.getCartNum() * cartDto.getProductDiscount(); // 小计 正常价
 					}
 				}else{
-					subTotal = cartDto.getCartNum() * cartDto.getProductPrice(); // 小计 正常价
+					subTotal = cartDto.getCartNum() * cartDto.getProductDiscount(); // 小计 正常价
 				}
 				total += subTotal;
 				OrderItem item = new OrderItem();
 				item.setItemNum(cartDto.getCartNum());
-				item.setItemProductDiscount(cartDto.getProductPrice());
+				item.setItemProductDiscount(cartDto.getProductDiscount());
 				item.setItemProductId(cartDto.getCartProductId());
 				item.setItemProductName(cartDto.getProductName());
 				item.setItemProductPic(cartDto.getColorImg());
 				item.setItemSalesOrderid(order.getSalesOrderid());
 				item.setItemTotal(subTotal);
 				item.setItemProductType(cartDto.getProductType());
-				item.setItemProductPrice(cartDto.getProductDiscount());
+				item.setItemProductPrice(cartDto.getProductPrice());
 				item.setItemColorId(cartDto.getCartColorId());
+				item.setItemGiftList(cartDto.getItemGiftList());
 				list.add(item);
 			}
 		}
@@ -943,68 +900,6 @@ public class OrderHandler {
 		return cartIntList;
 	}
 
-	/**
-	 * 赠送赠品
-	 * @param cartDtoList
-	 */
-	private void giftCart(List<CartDto> cartDtoList){
-		List<CartDto> giftList = new ArrayList<>();
-		SettlementGift settlementGift = new SettlementGift();
-		settlementGift.setSettGiftStatus(1);
-		List<SettlementGift> settlementGiftList = settlementGiftService.getSettlementGiftList(settlementGift);
-		for (CartDto cd:cartDtoList) {
-			for (SettlementGift sg:settlementGiftList) {
-				if(Objects.equals(cd.getCartColorId(), sg.getSettGiftFillColorId())){//添加赠送产品
-					CartDto cartDto = new CartDto();
-					cartDto.setCartColorId(sg.getSettGiftGiftColorId());
-					Integer num = sg.getSettGiftNum();
-					if(sg.getSettGiftNum() < 1){	//判断赠送数量，大于0就用该数量
-						num = cd.getCartNum();
-					}
-					cartDto.setCartNum(num);
-					cartDto.setProductDiscount(sg.getSettGiftPrice());
-					cartDto.setProductPrice(sg.getSettGiftPrice());
-					cartDto.setTotal(sg.getSettGiftPrice()*num);
-					cartDto.setProductIsSpell(cd.getProductIsSpell());
-					cartDto.setColorSpellAmount(sg.getSettGiftPrice());
-					giftList.add(cartDto);
-				}
-			}
-		}
 
-		List<CartDto> newGiftList = new ArrayList<>();
-		if(giftList != null && giftList.size() > 0){
-			for (CartDto carD:giftList) {
-				boolean fl = false;
-				for(CartDto newCarD:newGiftList) {
-					if(Objects.equals(newCarD.getCartColorId(), carD.getCartColorId())){	//赠品相同，合并
-						fl = true;
-						newCarD.setCartNum(newCarD.getCartNum() + carD.getCartNum());
-						newCarD.setProductDiscount(newCarD.getProductDiscount() +  carD.getProductDiscount());
-						newCarD.setProductPrice( newCarD.getProductPrice() + carD.getProductPrice());
-						newCarD.setTotal(newCarD.getTotal() + carD.getTotal());
-					}
-				}
-				if(!fl){
-					Product product = productInfoService.selectProductByColorId(carD.getCartColorId());
-					carD.setCartId(1);
-					carD.setCartProductId(product.getProductId());
-					carD.setProductName("【赠品】"+product.getProductName());
-					carD.setProductType(product.getProductTypeId());
-					carD.setProductStatus(1);
-					carD.setProductIntroduceImg(product.getColorImg());
-					carD.setProductRemark(product.getColorPresent());
-					carD.setProductColor(product.getColorName());
-					carD.setColorImg(product.getColorImg());
-					CartDto newCartDto = new CartDto();
-					BeanUtils.copyProperties(carD,newCartDto);
-					newGiftList.add(newCartDto);
-				}
-			}
-		}
-		if(newGiftList != null && newGiftList.size() > 0){
-			cartDtoList.addAll(newGiftList);
-		}
-	}
 
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/orderListener/OrderCloseListener.java

@@ -7,6 +7,11 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.iamberry.wechat.core.entity.eo.GiftPool;
+import com.iamberry.wechat.core.entity.eo.ItemGift;
+import com.iamberry.wechat.core.entity.order.OrderItem;
+import com.iamberry.wechat.face.eo.GiftPoolService;
+import com.iamberry.wechat.face.eo.ItemGiftService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
@@ -23,12 +28,15 @@ public class OrderCloseListener {
 
 	@Autowired
 	private AdminOrderService adminOrderService; 
-	
 	@Autowired
 	private CouponItemService couponItemService;
-	
 	@Autowired
 	private SendMessageUtil sendMessageUtil;
+	@Autowired
+	GiftPoolService giftPoolService;
+	@Autowired
+	ItemGiftService itemGiftService;
+
 	
 	//已经推送过的		key:orderid		velue：推送时间
 	public final static Map<String, Object> validateCodeMap = new ConcurrentHashMap<String, Object>();
@@ -92,6 +100,22 @@ public class OrderCloseListener {
 		if (itemList.size()> 0) {
 			couponItemService.updateCouponItemList(itemList);
 		}
+		for (Order or : orderList) {
+			//恢复赠品的库存
+			List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(or.getSalesOrderid());
+			for (OrderItem orderItem:orderItemList) {
+				ItemGift itemGift = new ItemGift();
+				itemGift.setItemId(orderItem.getItemId());
+				List<ItemGift> itemGiftList = itemGiftService.getItemGiftList(itemGift);
+				for (ItemGift ig:itemGiftList) {
+					GiftPool gp = new GiftPool();
+					gp.setGiftPoolId(ig.getGiftPoolId());
+					gp.setGiftPoolStock(ig.getItemGiftNum());
+					giftPoolService.updateAddStock(gp);
+				}
+			}
+		}
+
 	}
 	
 	//时间大于5分钟的，全部都 移除.......

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/thanksgiving/ThanksGivingHandler.java

@@ -187,7 +187,6 @@ public class ThanksGivingHandler {
             int flag = homeService.insertMemberInfo(member);
             if (flag < 1) {
                 logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=请先关注“Watero水时代”公众号，并联系客服添加用户!");
-                System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"==请先关注“Watero水时代”公众号，并联系客服添加用户!");
                 return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号，并联系客服添加用户!",null);
             }
         }
@@ -199,7 +198,6 @@ public class ThanksGivingHandler {
         Date verificationDate = (Date) session.getAttribute("verification_date");
         if(verificationTel == null || verificationCode == null || verificationDate == null){
             logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=领取出错，请重新获取验证码");
-            System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"==领取出错，请重新获取验证码");
             return new ResultMsg(false, ResultMsg.ERROR, "领取出错，请重新获取验证码!",null);
         }
         if(phone.length() != 11 && phone.equals(verificationTel)){
@@ -216,7 +214,6 @@ public class ThanksGivingHandler {
         Date verData = nowTime.getTime();
         if(!verificationCode.equals(code)){
             logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=验证码不正确，请重新输入");
-            System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"==验证码不正确，请重新输入");
             return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确，请重新输入!",null);
         }
         if((verData.getTime() < System.currentTimeMillis())){
@@ -228,13 +225,11 @@ public class ThanksGivingHandler {
         List<ThanksGiving> thanksGivingList = thanksGivingService.getThanksGivingList(thanksGiving);
         if(thanksGivingList == null){
             logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=您的手机号码未录入到老客户行列，暂时无法领取，详情请联系客服人员");
-            System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"=您的手机号码未录入到老客户行列，暂时无法领取，详情请联系客服人员");
             return new ResultMsg(false, ResultMsg.ERROR, "您的手机号码未录入到老客户行列，暂时无法领取，详情请联系客服人员!",null);
         }
         thanksGiving = thanksGivingList.get(0);
         if(thanksGiving.getThanksGivingStatus() != 1 ){
             logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=领取失败，该电话号码已领取优惠券!==="+thanksGiving.getThanksGivingStatus());
-            System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"=领取失败，该电话号码已领取优惠券!==="+thanksGiving.getThanksGivingStatus());
             return new ResultMsg(false, ResultMsg.ERROR, "领取失败，该电话号码已领取优惠券!",null);
         }
 
@@ -251,7 +246,6 @@ public class ThanksGivingHandler {
         }
         if(flag < 1){
             logger.info("openid="+member.getUserOpenid()+"phone："+phone+"=领取失败，请重新领取!");
-            System.out.println("openid="+member.getUserOpenid()+"phone："+phone+"=领取失败，请重新领取!");
             return new ResultMsg(false, ResultMsg.ERROR, "领取失败，请重新领取!",null);
         }
 

watero-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -238,7 +238,12 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.mothMovable.MothPopularity" alias="MothPopularity"/>
 
 		<!--赠品-->
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.SettlementGift" alias="SettlementGift"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.SettlementGift" alias="SettlementGift"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.GiftCondition" alias="GiftCondition"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.GiftPool" alias="GiftPool"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.Promotions" alias="Promotions"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.Spike" alias="Spike"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.eo.ItemGift" alias="ItemGift"/>
 
 		<!--团购-->
 		<!--<typeAlias type="com.iamberry.wechat.core.entity.order.ShopSpellInfo" alias="ShopSpellInfo"/>-->
@@ -344,6 +349,11 @@
 
 		<!--赠品-->
 		<mapper resource="com/iamberry/wechat/service/mapper/settlementGiftMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/giftPoolMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/promotionsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/spikeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/giftConditionMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/itemGiftMapper.xml"/>
 
 	</mappers>
 </configuration>

watero-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -49,13 +49,12 @@
 	
 	<!-- 加载静态资源 -->
 	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
-	
+
 	<!-- 开启注解启动定时器 -->
     <!--<task:annotation-driven/>-->
-    
-    <!-- 将30天后奖励积分的定时任务的xml引入
-	<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>  -->
-	
+    <!-- 将30天后奖励积分的定时任务的xml引入 -->
+	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->
+
 	<import resource="classpath:iamberry-wechat-service-datasource.xml"/>
 	
 	<!-- spring监控 -->