watero 618活动修改

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

@@ -0,0 +1,82 @@
+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/product/Product.java

@@ -25,8 +25,7 @@ public class Product implements java.io.Serializable{
 	private String productAbbreviation;		//商品简称
 	private Integer productDiscount;		//商品折扣价<数据库无字段>
 	private Integer productPrice;			//商品原价<数据库无字段>
-	private String colorImg;	//颜色图片
-	
+
 	private Integer productSalesnum;		//已售数量
 	private Integer productAccessnum;		//浏览量
 	private Integer productStatus;			//商品状态		1:在售	2:停止销售	3:删除
@@ -50,6 +49,13 @@ public class Product implements java.io.Serializable{
 	private Date beginDate;			//页面显示  开始时间
 	private Date endDate;				//页面显示  结束时间
 
+	private Integer productTypeId;	//类型id
+	private String colorImg;	//颜色图片
+	private String colorName;	//颜色名称
+	private String colorPresent;	//颜色介绍
+	private Integer colorDiscount;	//优惠价
+	private Integer colorPrice;	//原价
+
 	public Integer getColorId() {
 		return colorId;
 	}
@@ -266,6 +272,46 @@ public class Product implements java.io.Serializable{
 		this.colorImg = colorImg;
 	}
 
+	public Integer getProductTypeId() {
+		return productTypeId;
+	}
+
+	public void setProductTypeId(Integer productTypeId) {
+		this.productTypeId = productTypeId;
+	}
+
+	public String getColorName() {
+		return colorName;
+	}
+
+	public void setColorName(String colorName) {
+		this.colorName = colorName;
+	}
+
+	public String getColorPresent() {
+		return colorPresent;
+	}
+
+	public void setColorPresent(String colorPresent) {
+		this.colorPresent = colorPresent;
+	}
+
+	public Integer getColorDiscount() {
+		return colorDiscount;
+	}
+
+	public void setColorDiscount(Integer colorDiscount) {
+		this.colorDiscount = colorDiscount;
+	}
+
+	public Integer getColorPrice() {
+		return colorPrice;
+	}
+
+	public void setColorPrice(Integer colorPrice) {
+		this.colorPrice = colorPrice;
+	}
+
 	@Override
 	public String toString() {
 		return "Product [productId=" + productId + ", productName="

watero-wechat-web/src/main/java/com/iamberry/wechat/utils/SendMessageUtil.java

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.utils;
+package com.iamberry.wechat.sendMsg;
 
 import java.util.HashMap;
 

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

@@ -51,4 +51,11 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
 }

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

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.face.cart;
+
+import com.iamberry.wechat.core.entity.cart.SettlementGift;
+
+import java.util.List;
+
+/**
+ *  结算赠品接口
+ * @author Administrator
+ * @Date 2019-05-23
+ */
+public interface SettlementGiftService {
+    /**
+     * 获取集合
+     * @param  settlementGift
+     * @return List
+     */
+    List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift);
+    /**
+     * 查询单条数据
+     * @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/ActivityUtil.java

@@ -57,10 +57,10 @@ public class ActivityUtil {
      * 判断是否在注销时间内
      * @return 期限内true；
      */
-    public ActivityDate doubleTwelve(){
+    public ActivityDate isActivity(){
         ActivityDate activityDate = initDate(1);
 
-        activityDate.setRemark("38女神节注销活动时间");
+        activityDate.setRemark("618活动");
 
         if(activityDate == null){
             activityDate.setStatus(false);
@@ -76,7 +76,7 @@ public class ActivityUtil {
     }
 
     /**
-     * 查询用户是否有38节满减满赠优惠
+     * 查询用户是否满赠优惠
      * @return true/false；
      */
     public boolean getFullReduction(String openid){

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

@@ -88,5 +88,10 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 		return productInfoDao.getLeaseProduct(productId);
 	}
 
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoDao.selectProductByColorId(colorId);
+	}
+
 	
 }

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

@@ -0,0 +1,56 @@
+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/ProductInfoDao.java

@@ -47,4 +47,10 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
 }

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

@@ -70,6 +70,11 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 		// TODO Auto-generated method stub
 		return productInfoMapper.getLeaseProduct(productId);
 	}
-	
+
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoMapper.selectProductByColorId(colorId);
+	}
+
 
 }

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

@@ -49,4 +49,11 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
 }

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

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.cart.SettlementGift;
+
+import java.util.List;
+
+/**
+ *  结算赠品接口
+ * @author Administrator
+ * @Date 2019-05-23
+ */
+public interface SettlementGiftMapper {
+    /**
+     * 获取集合
+     * @param  settlementGift
+     * @return List
+     */
+    List<SettlementGift> getSettlementGiftList(SettlementGift  settlementGift);
+    /**
+     * 查询单条数据
+     * @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/productInfoMapper.xml

@@ -219,4 +219,32 @@
 			and
 			PRODUCT_RENT_TYPE = 2
 	</select>
+
+	<!--根据产品颜色id查询产品信息-->
+	<select id="selectProductByColorId"  resultType="Product">
+		SELECT
+		PRODUCT_ID productId,
+		PRODUCT_NAME productName,
+		PRODUCT_ABBREVIATION productAbbreviation,
+		PRODUCT_SALESNUM productSalesnum,
+		PRODUCT_ACCESSNUM productAccessnum,
+		PRODUCT_STATUS productStatus,
+		PRODUCT_INTRODUCE_IMG productIntroduceImg,
+		PRODUCT_PARAMETER_IMG productParameterImg,
+		PRODUCT_CREATE_DATE productCreateDate,
+		PRODUCT_SORT_NUM productSortNum,
+		PRODUCT_COLOR_DES productColorDes,
+		PRODUCT_REMARK productRemark,
+		PRODUCT_TYPE productTypeId,
+		PRODUCT_RENT_TYPE productRentType,
+		PC.COLOR_NAME,
+		PC.color_img,
+		PC.color_discount,
+		PC.color_price,
+		PC.color_69code
+		FROM tb_iamberry_product_info PI
+		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
+		WHERE PC.color_id=#{colorId}
+	</select>
+
 </mapper>

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

@@ -0,0 +1,96 @@
+<?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.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="sett_gift_status"    property="settGiftStatus" />
+        <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.sett_gift_status,
+        t.sett_gift_create_time
+    </sql>
+    <select id="getSettlementGiftList" resultMap="BaseResultMap" parameterType="SettlementGift" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_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 >
+            <if test="settGiftStatus != null ">
+                AND t.sett_gift_status = #{settGiftStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getSettlementGiftById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_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/wechat/WeChatServiceImpl.java

@@ -8,6 +8,13 @@ import java.util.*;
 
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.admin.FullReduction;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.core.entity.coupon.CouponType;
+import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
+import com.iamberry.wechat.face.coupon.CouponItemService;
+import com.iamberry.wechat.face.coupon.CouponTypeService;
+import com.iamberry.wechat.face.mothMovable.MothMovableService;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 import com.iamberry.wechat.service.ActivityUtil;
 import com.iamberry.wechat.service.member.dao.MemberDao;
 import com.iamberry.wechat.service.mothMovable.MothMovableServiceImpl;
@@ -82,7 +89,13 @@ public class WeChatServiceImpl implements WeChatService {
 	@Autowired
 	private ActivityUtil activityUtil;
 	@Autowired
-	private MothMovableServiceImpl mothMovableService;
+	private MothMovableService mothMovableService;
+	@Autowired
+	private CouponTypeService couponTypeService;
+	@Autowired
+	private CouponItemService couponItemService;
+	@Autowired
+	private SendMessageUtil sendMessageUtil;
 	/**
 	 * 处理微信发来的请求
 	 * @return
@@ -147,9 +160,9 @@ public class WeChatServiceImpl implements WeChatService {
 				if (content.startsWith(NameUtils.getConfig("PLACE_CODE_PREFIX"))) {// 激活码为“CODE”开头 则为代理商绑定
 						content = StringUtils.trim(content);
 						respContent = bulidPlace(content, fromUserName);
-				}/*else if ("女王节".equals(content)) {// 2019-3-8节活动 输入女王节可获得满减满赠优惠
-					respContent = addFullReduction(fromUserName);//为该用户添加满减资格记录
-				} */else {
+				}else if ("618".equals(content)) {// 618
+					respContent = add618Reduction(fromUserName);
+				}else {
 					// 文本类型的消息处理
 					Status status = messageHandler(content, requestMap, fromUserName, toUserName, createTime+"");
 					if (status.isFlag()) {
@@ -446,7 +459,7 @@ public class WeChatServiceImpl implements WeChatService {
 	 * @return
 	 */
 	public String addFullReduction(String fromUserName) {
-		ActivityDate activityDate = activityUtil.doubleTwelve();
+		ActivityDate activityDate = activityUtil.isActivity();
 		if(activityDate.isStatus()){
 			if (fromUserName == null) {
 				return NameUtils.getConfig("FEMALE_LADY_ERROR");
@@ -474,7 +487,64 @@ public class WeChatServiceImpl implements WeChatService {
 			return "活动已结束！";
 		}
 	}
-	
+
+	/**
+	 * 618活动
+	 * @param fromUserName openid
+	 * @return
+	 */
+	public String add618Reduction(String fromUserName) {
+		if (fromUserName == null) {
+			return NameUtils.getConfig("FEMALE_LADY_ERROR");
+		}
+
+		Date date = new Date();
+		Calendar endCalendar = Calendar.getInstance();
+		endCalendar.set(2019,6,18,23,59,59);
+		Date endDate = endCalendar.getTime();
+		if(endDate.before(date)){//date>endDate?true：false
+			return "活动已过期，请稍后重试！";
+		}
+
+		Integer couponId = 10002;
+		CouponType couponType = couponTypeService.getCouponTypeById(couponId);
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.YEAR, 2019);
+		calendar.set(Calendar.MONTH, 6);
+		calendar.set(Calendar.DAY_OF_MONTH, 18);
+		calendar.set(Calendar.HOUR_OF_DAY,23);
+		calendar.set(Calendar.MINUTE,59);
+		calendar.set(Calendar.SECOND,59);
+		CouponItem couponItem = new CouponItem();
+		String uuidStr = StrUtils.getUUID();
+		couponItem.setCouponItemId(uuidStr);
+		couponItem.setCouponItemUseropenid(fromUserName);
+		couponItem.setCouponId(couponId);
+		couponItem.setCouponReceiveDate(new Date());
+		couponItem.setCouponUseEndDate(calendar.getTime());
+		couponItem.setCouponUseStatus(1);
+		couponItem.setCouponItemRemark(couponType.getCouponRemark());
+		Integer flag = couponItemService.insertCouponItem(couponItem);
+		if(flag < 1){
+			return "领取优惠券失败，请稍后重试！";
+		}
+
+		// 推送信息
+		try {
+			sendMessageUtil.servicePush(
+					"亲爱的用户，恭喜您已领取WaterO年中大促活动50元代金券",
+					"WaterO微商城50元抵用券",
+					"有效期至2019-06-18",
+					"可在“会员中心—券包”查看，请尽快使用。",
+					fromUserName,
+					ResultInfo.SERVICE_PUSH_URL);
+		}catch (Exception e){
+			logger.info("推送消息失败，失败openId："+fromUserName);
+			e.printStackTrace();
+		}
+		return "";
+	}
+
 	/**
 	 * 已关注用户扫描二维码事件
 	 * @param requestMap

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -20,7 +20,7 @@ import com.iamberry.wechat.core.entity.admin.AdminLoginDTO;
 import com.iamberry.wechat.face.admin.AdminLoginService;
 import com.iamberry.wechat.face.mq.EfastOrderService;
 import com.iamberry.wechat.filters.CSRFTokenFilter;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 /**
  * description : 后台登陆handler类
  * @author 何秀刚

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -51,7 +51,7 @@ import com.iamberry.wechat.handles.mq.MQServiceProxy;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 @Controller
 @RequestMapping("/admin/order")

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminProbationOrderHandler.java

@@ -10,7 +10,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,24 +20,14 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.iamberry.wechat.core.entity.ProbationOrderUtil;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.drp.PlaceInfo;
-import com.iamberry.wechat.core.entity.member.CashLog;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.mq.MQMessage;
 import com.iamberry.wechat.core.entity.order.MessageDto;
-import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderActionDto;
-import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.ProbationOrder;
-import com.iamberry.wechat.core.entity.reback.RebackInfo;
-import com.iamberry.wechat.core.entity.relationship.DealerRelation;
-import com.iamberry.wechat.core.entity.relationship.WdRelation;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.order.AdminProbationOrderService;
 import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 @Controller
 @RequestMapping("/admin/probationOrder")

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -99,13 +99,7 @@ public class AgentHandler {
 		
 		AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
 		agentMember.setUserIsVip(member.getUserIsVip());
-
-		ActivityDate activityDate = activityUtil.doubleTwelve();
-		if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
-			agentMember.setUser38Interests(1);
-		}else{
-			agentMember.setUser38Interests(2);
-		}
+		agentMember.setUser38Interests(2);
 
 		// TODO:此处不算会员中心业务，需要优化
 		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();

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

@@ -724,11 +724,12 @@ public class CartHandlers {
 		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
 		Order order = new Order();
 		order.setSalesOrderid(orderId);
-		order.setOldStatus(status);
+//		order.setOldStatus(status);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(102);
 		if (null != orderId && !"".equals(orderId)) {
 			ShopSalesOrderDto orderDto = this.cartService.getOpenIdAndStatus(orderId);
-			if (orderDto != null) {
+			Integer sta = Integer.valueOf(orderDto.getSalesStatus());
+			if (orderDto != null && (sta == 2 || sta == 5)) {
 				if (!openId.equals(orderDto.getSalesOpenid())) {
 					remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
 					remsg.setResultCode(ResultInfo.ERRORCODE);
@@ -815,12 +816,14 @@ public class CartHandlers {
 		Order order = new Order();
 		order.setSalesOrderid(orderId);
 		order.setSalesChangeOrderid(changeOrderId);
-		order.setOldStatus(status);
+//		order.setOldStatus(status);
 		order.setSalesExchangeDes(remake);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(103);
 		if (null != orderId && !"".equals(orderId)) {
 			ShopSalesOrderDto orderDto = this.cartService.getOpenIdAndStatus(orderId);
-			if (orderDto != null) {
+			order.setOldStatus(Integer.valueOf(orderDto.getSalesStatus()));
+			Integer sta = Integer.valueOf(orderDto.getSalesStatus());
+			if (orderDto != null && (sta==5 || sta==12)) {
 				if (!openId.equals(orderDto.getSalesOpenid())) {
 					remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
 					remsg.setResultCode(ResultInfo.ERRORCODE);

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

@@ -31,7 +31,7 @@ import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.OrderNOUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 @Controller
 @RequestMapping("/wechat/probationOrder")
 public class ProbationOrderHandler {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/giftCard/CardHandler.java

@@ -45,7 +45,7 @@ import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 /**
  * 提货卡handler

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mothMovable/MothMovableHandler.java

@@ -11,7 +11,7 @@ import com.iamberry.wechat.face.mothMovable.MothMovableService;
 import com.iamberry.wechat.face.stati.AcceStatisticsService;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.WeixinUtil;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -36,7 +36,7 @@ import com.iamberry.wechat.face.task.WechatTaskService;
 import com.iamberry.wechat.service.StaticCacheMemory;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 import com.iamberry.zk.SpringContextHolder;
 /**
  * @author:何秀刚

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

@@ -11,10 +11,12 @@ import com.iamberry.wechat.core.entity.mq.MQMessage;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.pay.PayResult;
+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.CartService;
 import com.iamberry.wechat.face.cart.ProductInfoService;
+import com.iamberry.wechat.face.cart.SettlementGiftService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
 import com.iamberry.wechat.face.coupon.ExchangeService;
@@ -31,6 +33,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.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,10 +45,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author 何秀刚
@@ -94,6 +94,8 @@ public class OrderHandler {
 	private ProductColorService productColorService;
 	@Autowired
 	private ActivityUtil activityUtil;
+	@Autowired
+	private SettlementGiftService settlementGiftService;
 	/**
 	 * 支付前，调用方法
 	 * @param request
@@ -146,41 +148,45 @@ public class OrderHandler {
 		}
 		
 		//根据openid查询该用户是否购买过订单
-		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-		shopSalesOrderDto.setSalesStatus("2");
-		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
+//		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());
-						}
-					}
-				}
-			}
+//		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);
 		}
-		
+
 		// 判断当前提交的购物车ID，有多少产品在售
 		int total = 0; // 支付金额
 		int sum = 0; // 产品数量
 		int productNum = 0;	//计算商品为滤芯的数量
 		boolean disable = true;	//标识，是否可用优惠券，当购买商品只有滤芯时禁止使用优惠券
-		
-		List<CartDto> tempCarts = new ArrayList<CartDto>();
+
 		for (CartDto cartDto : cartDtos) {
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				total += cartDto.getCartNum() * cartDto.getProductPrice();
 				sum++;
-				tempCarts.add(cartDto);
 			}
 			//计算商品为滤芯的数量
 			if (cartDto.getProductType().intValue() == 2) {
@@ -197,7 +203,7 @@ public class OrderHandler {
 			msg.setMessage(ResultInfo.cartEmptyError);
 			return msg;
 		}
-		
+
 		//未使用的优惠券
 		CouponItemDto cDto = new CouponItemDto();	
 		cDto.setUseropenid(member.getUserOpenid());
@@ -246,19 +252,12 @@ public class OrderHandler {
 		dto.setUserIsVip(member.getUserIsVip());
 		dto.setCartId(cartIds);// 购物车ID
 		dto.setPayTotal(total); // 支付金额,单位为分
-		dto.setCartItems(tempCarts); // 订单项
+		dto.setCartItems(cartDtos); // 订单项
 		dto.setSuccess(true); // 请求成功
 		dto.setMeonyProportion(0);
 		dto.setBalance(member.getUserIncome());
+		dto.setUser38Interests(2);	//活动过期
 
-		ActivityDate activityDate = activityUtil.doubleTwelve();
-		if(activityDate.isStatus() && activityUtil.getFullReduction(member.getUserOpenid())){
-			dto.setUser38Interests(1);	//有权益
-		}else{
-			dto.setUser38Interests(2);	//无权益
-		}
-
-		
 		dto.setDisable(disable);
 		
 		//回显用户支付过的地址信息
@@ -376,10 +375,10 @@ public class OrderHandler {
 		}
 
 		//根据openid查询该用户是否购买过订单
-		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-		shopSalesOrderDto.setSalesStatus("2");
-		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
+//		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
+//		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
+//		shopSalesOrderDto.setSalesStatus("2");
+//		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
 		
 		int total = 0; // 需要支付的总额, 单位为分
 
@@ -397,17 +396,23 @@ public class OrderHandler {
 		order.setSalesOrderid(OrderNOUtil.createOrderCode(member.getUserId())); // 订单ID
 		List<OrderItem> list = new ArrayList<OrderItem>();
 		List<Integer> cartIds = new ArrayList<Integer>();
+
+		//添加赠品
+		ActivityDate activityDate = activityUtil.isActivity();
+		if(activityDate.isStatus()){
+			giftCart(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());
-				}
-			}
+//			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();
@@ -439,8 +444,7 @@ public class OrderHandler {
 		// 准备订单对象
 		order.setSalesOpenid(member.getUserOpenid()); // openid 
 		order.setSalesAmount(total); // 订单金额
-		total -= priceReduction;
-		
+
 		int mustPay=0;
 		
 		String couponId=temp.getCouponId();
@@ -516,27 +520,8 @@ public class OrderHandler {
 			}
 		}
 
-		ActivityDate activityDate = activityUtil.doubleTwelve();
-		if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
-			if(total > 200000){
-				ProductColor productColor = productColorService.selectProductColorById(48);
-				OrderItem item = new OrderItem();
-				item.setItemNum(1);
-				item.setItemProductDiscount(0);
-				item.setItemProductId(productColor.getColorProductId());
-				item.setItemProductName(productColor.getColorProductName());
-				item.setItemProductPic(productColor.getColorImg());
-				item.setItemSalesOrderid(order.getSalesOrderid());
-				item.setItemTotal(0);
-				item.setItemProductType(productColor.getColorProductType());
-				item.setItemProductPrice(0);
-				item.setItemColorId(productColor.getColorId());
-				list.add(item);
-			}
-			if(total > 300000){
-				total = total - 10000;
-			}
-		}
+		// 套装减去100元
+		total -= priceReduction;
 
 		if(total==0 || total<0){
 			total=0;
@@ -768,4 +753,64 @@ 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);
+					giftList.add(cartDto);
+				}
+			}
+		}
+
+		if(giftList != null && giftList.size() > 0){
+			for (CartDto carD:giftList) {
+				boolean flag = false;
+				for (CartDto cd:cartDtoList) {
+					if(Objects.equals(cd.getCartColorId(), carD.getCartColorId())){
+						flag = true;
+						cd.setCartNum(cd.getCartNum() + carD.getCartNum());
+						cd.setProductDiscount(cd.getProductDiscount() +  carD.getProductDiscount());
+						cd.setProductPrice( cd.getProductPrice() + carD.getProductPrice());
+						cd.setTotal(cd.getTotal() + carD.getTotal());
+					}
+				}
+				if(!flag){
+					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);
+					cartDtoList.add(newCartDto);
+				}
+			}
+		}
+	}
+
+
 }

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

@@ -17,7 +17,7 @@ import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 public class OrderCloseListener {
 

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

@@ -17,7 +17,7 @@ import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.relationship.DealerRelationService;
 import com.iamberry.wechat.face.relationship.WdRelationService;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 /**
  * 定时任务：30天后自动奖励积分

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/RequestWechatPayHandler.java

@@ -26,7 +26,6 @@ import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.cart.CartDto;
 import com.iamberry.wechat.core.entity.cart.SendPayDto;
-import com.iamberry.wechat.core.entity.giftCard.AgentInfo;
 import com.iamberry.wechat.core.entity.giftCard.AgentMachine;
 import com.iamberry.wechat.core.entity.giftCard.AgentPayLogs;
 import com.iamberry.wechat.core.entity.giftCard.GiftCardPayCode;
@@ -45,7 +44,7 @@ import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.StrUtils;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 
 /**

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilderFactory;
 
 import com.iamberry.wechat.core.entity.rent.ReserveOrder;
 import com.iamberry.wechat.face.reserve.ReserveService;
@@ -67,7 +66,7 @@ import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.StaticInfo;
 import com.iamberry.wechat.tools.StrUtils;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 /**
  * @author 何秀刚

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/probation/ProbationHandler.java

@@ -33,7 +33,7 @@ import com.iamberry.wechat.face.probation.ProbationService;
 import com.iamberry.wechat.face.relationship.DealerRelationService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.sendMsg.SendMessageUtil;
 
 
 /**

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

@@ -237,6 +237,9 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.mothMovable.MothMovable" alias="MothMovable"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.mothMovable.MothPopularity" alias="MothPopularity"/>
 
+		<!--赠品-->
+		<typeAlias type="com.iamberry.wechat.core.entity.cart.SettlementGift" alias="SettlementGift"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
 	<mappers>
@@ -336,5 +339,8 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/mothMovableMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/mothPopularityMapper.xml"/>
 
+		<!--赠品-->
+		<mapper resource="com/iamberry/wechat/service/mapper/settlementGiftMapper.xml"/>
+
 	</mappers>
 </configuration>