Merge remote-tracking branch 'origin/master'

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -287,7 +287,7 @@ public class ResultInfo {
 	/** 	拼单成功推送 	*/
 	public static String PROBATIONSPELLSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
 
-	/** 	拼单成功推送 	*/
+	/** 	会员积分 	*/
 	public static String MEMBERACTIVATION = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
 
 

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

@@ -59,7 +59,7 @@ public class PromotionsServiceImpl  implements PromotionsService {
         List<Spike> spikeList = spikeService.getSpikeListAll(str);
         promotions.setSpikeList(spikeList);
 
-        //获取当前活动所有秒杀
+        //获取当前活动积分兑换
         List<IntegralConfig> integralConfigList = integralConfigService.getSpikeListAllByPromo(str);
         promotions.setIntegralConfigList(integralConfigList);
 

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

@@ -1,10 +1,7 @@
 package com.iamberry.wechat.handles.agent;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -197,9 +194,10 @@ public class AgentHandler {
 
 		//使用request对象的getSession()获取session，如果session不存在则创建一个
 		HttpSession session = request.getSession();
-		String verificationTel = (String) session.getAttribute("verification_tel");
-		String verificationCode = (String) session.getAttribute("verification_code");
-		Date verificationDate = (Date) session.getAttribute("verification_date");
+		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
+		String verificationTel = (String) verificMemberPhoneMap.get("verification_tel");
+		String verificationCode = (String) verificMemberPhoneMap.get("verification_code");
+		Date verificationDate = (Date)  verificMemberPhoneMap.get("verification_date");
 		if(verificationTel == null || verificationCode == null || verificationDate == null){
 			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=完善信息失败，请重新获取验证码");
 			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，请重新获取验证码!",null);
@@ -263,9 +261,10 @@ public class AgentHandler {
 
 		//使用request对象的getSession()获取session，如果session不存在则创建一个
 		HttpSession session = request.getSession();
-		String verificationTel = (String) session.getAttribute("verification_tel");
-		String verificationCode = (String) session.getAttribute("verification_code");
-		Date verificationDate = (Date) session.getAttribute("verification_date");
+		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
+		String verificationTel = (String) verificMemberPhoneMap.get("verification_tel");
+		String verificationCode = (String) verificMemberPhoneMap.get("verification_code");
+		Date verificationDate = (Date)  verificMemberPhoneMap.get("verification_date");
 		if(verificationTel == null || verificationCode == null || verificationDate == null){
 			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=修改手机号码失败，请重新获取验证码");
 			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败，请重新获取验证码!",null);
@@ -321,6 +320,8 @@ public class AgentHandler {
 			return msg;
 		}
 
+		Member m = WechatUtils.getUserBySession(request);
+
 		//获取验证码
 		String num = RandomUtil.getRandom();
 		//使用request对象的getSession()获取session，如果session不存在则创建一个
@@ -329,9 +330,11 @@ public class AgentHandler {
 		String result = codeService.sendOtherCMS(phone, text);
 
 		//将数据存储到session中
-		session.setAttribute("verification_code",num );
-		session.setAttribute("verification_tel",phone );
-		session.setAttribute("verification_date",new Date());
+		Map verificMemberPhoneMap = new HashMap();
+		verificMemberPhoneMap.put("verification_code",num);
+		verificMemberPhoneMap.put("verification_tel",phone);
+		verificMemberPhoneMap.put("verification_date",new Date());
+		session.setAttribute("verification_tel_"+m.getUserOpenid(),verificMemberPhoneMap);
 
 		if ("SUCCESS".equals(result)) {
 			logger.info("短信发送成功，验证码为：" + num);

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

@@ -32,10 +32,8 @@ import javax.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @company	深圳爱贝源科技有限公司