修改关注提示语

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/FullReduction.java

@@ -0,0 +1,38 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2019/3/5.
+ */
+public class FullReduction implements Serializable{
+    private static final long serialVersionUID = 2372933567932487087L;
+    private Integer id;
+    private Integer openId;
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(Integer openId) {
+        this.openId = openId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.iamberry.wechat.core.entity.Page;
+import com.iamberry.wechat.core.entity.admin.FullReduction;
 import com.iamberry.wechat.core.entity.member.Member;
 
 /**
@@ -126,4 +127,18 @@ public interface MemberService{
 	 * @return
 	 */
 	public boolean updateIsBaughtByOpenid(String openid, int userIsBaught);
+
+	/**
+	 * 添加用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public Integer addFullReduction(String openId);
+
+	/**
+	 * 查询用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public FullReduction getFullReduction(String openId);
 }

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

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.utils;
+package com.iamberry.wechat.service;
 
 
 import com.iamberry.wechat.core.entity.activity.ActivityDate;

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

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.mapper;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.Page;
+import com.iamberry.wechat.core.entity.admin.FullReduction;
 import com.iamberry.wechat.core.entity.member.Member;
 
 /**
@@ -113,4 +114,18 @@ public interface MemberMapper {
 	 * @return
 	 */
 	public Integer updateUserIsVip(String openId);
+
+	/**
+	 * 添加用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public Integer addFullReduction(String openId);
+
+	/**
+	 * 查询用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public FullReduction getFullReduction(String openId);
 }

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

@@ -286,4 +286,19 @@
 		SET user_is_vip = 2
 		WHERE USER_OPENID = #{userOpenid}
 	</update>
+
+
+	<!-- 添加用户是否具有2019 38节 满减满赠权限记录 -->
+	<insert id="addFullReduction" parameterType="String">
+		insert into TB_IAMBERRY_FULL_REDUCTION
+		(open_id,create_date)
+		VALUES
+		(#{openId},NOW())
+	</insert>
+
+	<!-- 查询用户是否具有2019 38节 满减满赠权限记录 -->
+	<select id="getFullReduction" parameterType="String" resultType="FullReduction">
+		SELECT * from TB_IAMBERRY_FULL_REDUCTION where open_id = #{openId}
+	</select>
+
 </mapper> 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 
+import com.iamberry.wechat.core.entity.admin.FullReduction;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -305,4 +306,14 @@ public class MemberServiceImpl implements MemberService {
 			return false;
 		}
 	}
+
+	@Override
+	public Integer addFullReduction(String openId) {
+		return memberDao.addFullReduction(openId);
+	}
+
+	@Override
+	public FullReduction getFullReduction(String openId) {
+		return memberDao.getFullReduction(openId);
+	}
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/MemberDao.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.member.dao;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.Page;
+import com.iamberry.wechat.core.entity.admin.FullReduction;
 import com.iamberry.wechat.core.entity.member.Member;
 /**
  * 
@@ -101,4 +102,18 @@ public interface MemberDao {
 	 * @return
 	 */
 	public Integer updateIsBaughtByOpenid(Member member);
+
+	/**
+	 * 添加用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public Integer addFullReduction(String openId);
+
+	/**
+	 * 查询用户是否具有2019 38节 满减满赠权限记录
+	 * LJK
+	 * @return
+	 */
+	public FullReduction getFullReduction(String openId);
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -2,6 +2,7 @@ package com.iamberry.wechat.service.member.dao.imp;
 
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.admin.FullReduction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -117,4 +118,14 @@ public class MemberDaoImpl  implements MemberDao {
 		// TODO Auto-generated method stub
 		return memberMapper.updateIsBaughtByOpenid(member);
 	}
+
+	@Override
+	public Integer addFullReduction(String openId) {
+		return memberMapper.addFullReduction(openId);
+	}
+
+	@Override
+	public FullReduction getFullReduction(String openId) {
+		return memberMapper.getFullReduction(openId);
+	}
 }

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

@@ -6,6 +6,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.iamberry.wechat.core.entity.activity.ActivityDate;
+import com.iamberry.wechat.core.entity.admin.FullReduction;
+import com.iamberry.wechat.service.ActivityUtil;
+import com.iamberry.wechat.service.member.dao.MemberDao;
 import com.iamberry.wechat.tools.*;
 import net.sf.json.JSONObject;
 
@@ -72,9 +76,12 @@ public class WeChatServiceImpl implements WeChatService {
 	private SystemService systemService;
 	@Autowired
 	private WdRelationDao wdRelationDao;
+	@Autowired
+	private MemberDao memberDao;
+	@Autowired
+	private ActivityUtil activityUtil;
 	/**
 	 * 处理微信发来的请求
-	 * @param request
 	 * @return
 	 */
 	@Override
@@ -135,10 +142,12 @@ public class WeChatServiceImpl implements WeChatService {
 					return xml;
 				}
 
-				if (content.startsWith(NameUtils.getConfig("PLACE_CODE_PREFIX"))) {// 激活码为“CODE”开头 则为代理商绑定	
-					content = StringUtils.trim(content);
-					respContent = bulidPlace(content, fromUserName);
-				} else { 
+				if (content.startsWith(NameUtils.getConfig("PLACE_CODE_PREFIX"))) {// 激活码为“CODE”开头 则为代理商绑定
+						content = StringUtils.trim(content);
+						respContent = bulidPlace(content, fromUserName);
+				}if (content.startsWith(NameUtils.getConfig("FEMALE_LADY"))) {// 2019-3-8节活动 输入女王节可获得满减满赠优惠
+					respContent = addFullReduction(fromUserName);//为该用户添加满减资格记录
+				} else {
 					// 文本类型的消息处理
 					Status status = messageHandler(content, requestMap, fromUserName, toUserName, createTime+"");
 					if (status.isFlag()) {
@@ -371,6 +380,36 @@ public class WeChatServiceImpl implements WeChatService {
 			return qrcodeResult.getQroceUrl();
 		}*/
 	}
+
+	/**
+	 * 添加用户满减满赠资格（2019 38女王节活动）
+	 * @param fromUserName openid
+	 * @return
+	 */
+	public String addFullReduction(String fromUserName) {
+		ActivityDate activityDate = activityUtil.doubleTwelve();
+		if(activityDate.isStatus()){
+			if (fromUserName == null) {
+				return NameUtils.getConfig("FEMALE_LADY_ERROR");
+			}
+			// 判断此用户是否已有资格
+			FullReduction fullReduction = memberDao.getFullReduction(fromUserName);
+			if (fullReduction != null) {
+				return NameUtils.getConfig("FEMALE_LADY_REPLY");
+			}
+
+			// 绑定关系
+			int count = memberDao.addFullReduction(fromUserName);
+			if (count < 1) {
+				return NameUtils.getConfig("FEMALE_LADY_ERROR");
+			}else{
+				StringBuffer buffer = new StringBuffer(NameUtils.getConfig("FEMALE_LADY_REPLY"));
+				return buffer.toString();
+			}
+		}else{
+			return NameUtils.getConfig("FEMALE_LADY_INTRODUCE");
+		}
+	}
 	
 	/**
 	 * 已关注用户扫描二维码事件

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

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -14,8 +13,6 @@ import com.iamberry.wechat.core.entity.coupon.*;
 import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
-import com.iamberry.wechat.utils.ActivityUtil;
-import org.apache.xpath.operations.Bool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,7 +31,6 @@ import com.iamberry.wechat.core.entity.cart.TempOrderDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
 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.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.pay.PayResult;

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

@@ -225,6 +225,8 @@
 
 		<!--官网查询授权码-->
 		<typeAlias type="com.iamberry.wechat.core.entity.official.Prospectus" alias="Prospectus"/>
+		<!--2019 38节活动-->
+		<typeAlias type="com.iamberry.wechat.core.entity.admin.FullReduction" alias="FullReduction"/>
 
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>

watero-wechat-web/src/main/resources/platform.properties

@@ -194,4 +194,8 @@ RESERVE_PAY_CALLBACK=http//test.iamberry.com/watero/callback/reserver_back
 reserve_pay_money=1
 DO_MAIN=test.iamberry.com
 
-IMAGE_URL=https://w.iamberry.com
+IMAGE_URL=https://w.iamberry.com
+FEMALE_LADY=女王节
+FEMALE_LADY_REPLY=Hi，欢迎参加【WaterO】女王节活动，这里为你准备了双重宠爱的特别礼物。\n\n特别礼物1：满额即减。全场买满3000元即减100元。\n\n特别礼物2：满额即赠。全场买满2000元即赠Aiberle电动牙刷1支。\n\n活动时间：3月7日-16日\n\n机会有限，赶快点击这里享受女王礼遇吧。
+FEMALE_LADY_ERROR=激活女王节活动资格失败，请稍后重试！
+FEMALE_LADY_INTRODUCE=活动已结束！