Procházet zdrojové kódy

微信公众号推送修改

wangxiaoming před 5 roky
rodič
revize
880eaa2884

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

@@ -277,7 +277,7 @@ public class ResultInfo {
 	public static String ORDERWEIZHIFU = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'ordertape':{'color':'#000000','value':'ordertapeValue'}, 'ordeID':{'color':'#000000', 'value':'ordeIDVALUE'},'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 	
 	/** 	 试用进度提醒 	*/
-	public static String PROBATIONPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String PROBATIONPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	
 	/** 	 试用申请通知 	 */
 	public static String PROBATIONAPPLYNOTICE = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
@@ -292,10 +292,10 @@ public class ResultInfo {
 	public static String PROBATIONSHUTDOWN = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'transid':{'color':'#000000','value':'transidValue'}, 'fee':{'color':'#000000', 'value':'feeValue'}, 'pay_time':{'color':'#000000','value':'pay_timeValue'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	
 	/** 	奖品领取通知 	*/
-	public static String PRIZERECEIVEPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'keyword5':{'color':'#000000','value':'keyword5Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String PRIZERECEIVEPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'keyword5':{'color':'#000000','value':'keyword5Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 	服务推送 	*/
-	public static String SERVICEPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'Good':{'color':'#000000','value':'GoodValue'}, 'contentType':{'color':'#000000', 'value':'contentTypeValue'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String SERVICEPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'Good':{'color':'#000000','value':'GoodValue'}, 'contentType':{'color':'#000000', 'value':'contentTypeValue'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	拼单成功推送 	*/
 	public static String PROBATIONSPELLSUCCESS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
@@ -328,15 +328,15 @@ public class ResultInfo {
 	public static String DELIVERY_APPLICATION_FORM="nxUfbukZ-h1kglyqpqo7CbSsA_DMeXSV9r-8d7jV4Mk";
 
 	/** 	订单审核结果通知 	*/
-	public static String ORDERREVIEWRESULTS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String ORDERREVIEWRESULTS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	审核结果通知 	*/
-	public static String REVIEWRESULTS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String REVIEWRESULTS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	商品入库通知 	*/
-	public static String GOODSWAREHOUSINGNOTICE = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String GOODSWAREHOUSINGNOTICE = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	提货申请通知	*/
-	public static String APPLICATIONDELIVERYNOTIFICATION = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String APPLICATIONDELIVERYNOTIFICATION = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'keyword4':{'color':'#000000','value':'keyword4Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	申请单出库通知 	*/
-	public static String DELIVERYAPPLICATIONFORM = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String DELIVERYAPPLICATIONFORM = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000','value':'keyword3Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	我审核列表url 	*/
 	public static String LISTBEREVIEWED = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=2";
 	/** 	我发起列表url 	*/

+ 1 - 1
watero-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -56,7 +56,7 @@ public class SimpleCORSFilter implements Filter {
 			response.setHeader("Access-Control-Max-Age", "3600");
 			response.setHeader("Access-Control-Allow-Credentials", "true");
 			response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
-        }
+		}
         filterChain.doFilter(servletRequest, servletResponse);
     }
     public void destroy() {}

+ 1 - 1
watero-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java

@@ -43,7 +43,7 @@ public class ImberryConfig {
 	
 	static {
 		Properties pro = new Properties();
-		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
+		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("config.properties");
 		try {
 			pro.load(in);
 //			SMS_USERNAME = pro.getProperty("SMS_USERNAME");

+ 1 - 1
watero-wechat-service/src/main/java/com/iamberry/wechat/service/ism/IntegralLogServiceImpl.java

@@ -300,7 +300,7 @@ public class IntegralLogServiceImpl  implements IntegralLogService {
             throw  new RuntimeException("inteLogType积分类型不正确");
         }
 
-        logger.info("积分调整-类型:"+integralLog.getInteLogType()+";数量:"+integralLog.getInteLogChangeNum()+";userOpenId:"+integralLog.getUserOpenId());
+        logger.info("积分调整-类型:"+integralConfig.getInteConfName()+";数量:"+integralLog.getInteLogChangeNum()+";userOpenId:"+integralLog.getUserOpenId());
 
         integralLog.setInteLogName(integralConfig.getInteConfName());
         flag = integralLogMapper.save(integralLog);

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

@@ -155,8 +155,7 @@ public class MemberServiceImpl implements MemberService {
 					"亲爱的用户,恭喜您注册成功!现在就可享受专属会员权益:\\\\r\\\\n" +
 							"1.送T1/T2滤芯\\\\r\\\\n" +
 							"2.终身享受购买滤芯套装减免100元\\\\r\\\\n" +
-							"3.注册即送100积分,下单可抵扣10元\\\\r\\\\n" +
-							"\\\\r\\\\n",
+							"3.注册即送100积分,下单可抵扣10元",
 					"会员积分+会员专享",
 					"T1/T2滤芯专享券有效期3个月",
 					"可在“服务中心-会员中心”查看积分及会员专享优惠券,请及时使用优惠券。",

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

@@ -5,6 +5,7 @@ import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.validation.constraints.Max;
 
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
@@ -15,6 +16,7 @@ import com.iamberry.wechat.handles.thanksgiving.ThanksGivingHandler;
 import com.iamberry.wechat.service.ActivityUtil;
 import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.payUtil.RandomUtil;
+import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,24 +50,10 @@ import com.iamberry.wechat.tools.ResultInfo;
 @RequestMapping("/wechat/agent")
 public class AgentHandler {
 
-	private Logger logger = LoggerFactory.getLogger(AgentHandler.class);
 	@Autowired
 	private AgentOrderService agentOrderService;	//微代理订单service
 	@Autowired
 	private MemberService memberService;			//会员service
-	@Autowired
-	private AgentMemberService agentMemberService;	//微代理会员service
-	@Autowired
-	private CartService cartService;
-	@Autowired
-	private MQSerivce mQservice;
-	@Autowired
-	private ActivityUtil activityUtil;
-	@Autowired
-	private CodeService codeService;
-	@Autowired
-	private CouponItemService couponItemService;
-	
 	/**
 	 * 获取当前用户<微代理> 的订单记录
 	 * 2016年4月19日
@@ -100,277 +88,7 @@ public class AgentHandler {
 		return rm;
 	}
 	
-	/**
-	 * 会员中心页面
-	 * 2016年4月21日
-	 * @author 穆再兴
-	 * @return
-	 */
-	@RequestMapping("/member")
-	@ResponseBody
-	public ResultMsg getMemberInfo(HttpServletRequest req){
-		ResultMsg rm = new ResultMsg();
-		Member member = new Member();
-		String openId = req.getParameter("openId");
-		if(openId != null && !openId.equals("")){
-			member = memberService.getMemberByUserOpenId(openId);
-		}else{
-			member = WechatUtils.getUserBySession(req);
-		}
-		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-		AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
-		agentMember.setUserIsVip(member.getUserIsVip());
-		agentMember.setUserArrange(member.getUserArrange());
-		agentMember.setUser38Interests(2);
-		agentMember.setUserSurplusIntegral(member.getUserSurplusIntegral());	//userSurplusIntegral
-		agentMember.setUserTel(member.getUserTel());
-		agentMember.setUserSex(member.getUserSex());
-		agentMember.setUserBirthDate(member.getUserBirthDate());
-		agentMember.setUserName(member.getUserName());
-
-		CouponItemDto couponItemDto = new CouponItemDto();
-		couponItemDto.setCouponVipExclusive(1);
-		couponItemDto.setUseropenid(member.getUserOpenid());
-		couponItemDto.setBeginDate(new Date());
-		couponItemDto.setCouponUseStatus(1);
-		Integer couponCount = couponItemService.getCouponItemCount(couponItemDto);
-
-		CouponItemDto vipCouponItemDto = new CouponItemDto();
-		vipCouponItemDto.setCouponVipExclusive(2);
-		vipCouponItemDto.setUseropenid(member.getUserOpenid());
-		vipCouponItemDto.setBeginDate(new Date());
-		vipCouponItemDto.setCouponUseStatus(1);
-		Integer couponVipCount = couponItemService.getCouponItemCount(vipCouponItemDto);
-
-		agentMember.setCouponCount(couponCount);
-		agentMember.setCouponVipCount(couponVipCount);
 
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setStatus(true);
-		rm.setData(agentMember);
-		return rm;
-	}
-
-	/**
-	 * 完善用户信息
-	 * @return
-	 */
-	@RequestMapping("/updateMemberInfo")
-	@ResponseBody
-	public ResultMsg updateMemberInfo(HttpServletRequest request,Member member,String code){
-		ResultMsg rm = new ResultMsg();
-		Member m = WechatUtils.getUserBySession(request);
-
-		m = memberService.getMemberByUserOpenId(m.getUserOpenid());
-		if(m.getUserIsVip() == 2 && m.getUserArrange() == 1){
-			return new ResultMsg(false, ResultMsg.ERROR, "您已经是会员了!",null);
-		}
-
-		if(m.getUserOpenid()== null || "".equals(m.getUserOpenid())){
-			return new ResultMsg(false,  ResultMsg.ERROR, "完善信息失败-用户OpenId为空",null);
-		}
-		if(member == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,用户信息为空,请联系公众号客服!",null);
-		}
-
-		//姓名
-		if(member.getUserName() == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,姓名不能为空!",null);
-		}
-		//性别
-		if(member.getUserSex() == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,性别不能为空!",null);
-		}
-		//生日	userBirthDate
-		if(member.getUserBirthDate() == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,生日不能为空!",null);
-		}
-		//手机号码
-		if(member.getUserTel() == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,手机号码为空!",null);
-		}
-		//验证码
-		if(code == null || "".equals(code)){
-			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,验证码为空!",null);
-		}
 
-		//使用request对象的getSession()获取session,如果session不存在则创建一个
-		HttpSession session = request.getSession();
-		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);
-		}
-		if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
-			rm.setMessage(ResultMsg.ERROR);
-			rm.setMessage("电话号码错误!");
-			return rm;
-		}
-		if(code == null || "".equals(code)){
-			return new ResultMsg(false, ResultMsg.ERROR, "验证码为空!",null);
-		}
-		Calendar nowTime = Calendar.getInstance();
-		nowTime.setTime(verificationDate);
-		nowTime.add(Calendar.MINUTE, 5);
-		Date verData = nowTime.getTime();
-		if(!verificationCode.equals(code)){
-			logger.info("openid="+member.getUserOpenid()+"phone:"+member.getUserTel()+"=验证码不正确,请重新输入");
-			return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确,请重新输入!",null);
-		}
-		if((verData.getTime() < System.currentTimeMillis())){
-			return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效,请重新获取!",null);
-		}
 
-		ResultMsg msg = new ResultMsg();
-		member.setUserOpenid(m.getUserOpenid());
-		member.setUserIsVip(2);	//是否为vip :1:非vip  2:vip
-		member.setUserArrange(1);	////1:已整理  2:未整理
-		Integer  flag = memberService.becomeVipByOpenId(member);
-		if (flag > 0 ) {
-			msg.setResultCode(ResultInfo.SUCCESSCODE);
-			msg.setStatus(true);
-			return msg;
-		} else {
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("成为会员失败");
-			return msg;
-		}
-	}
-
-
-	/**
-	 * 修改手机号码
-	 * @return
-	 */
-	@RequestMapping("/updateMemberPhone")
-	@ResponseBody
-	public ResultMsg updateMemberPhone(HttpServletRequest request,Member member,String code){
-		ResultMsg rm = new ResultMsg();
-		Member m = WechatUtils.getUserBySession(request);
-
-		//手机号码
-		if(member.getUserTel() == null){
-			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败,手机号码为空!",null);
-		}
-		//验证码
-		if(code == null || "".equals(code)){
-			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败,验证码为空!",null);
-		}
-
-		//使用request对象的getSession()获取session,如果session不存在则创建一个
-		HttpSession session = request.getSession();
-		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);
-		}
-		if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
-			rm.setMessage(ResultMsg.ERROR);
-			rm.setMessage("修改手机号码失败-手机号码错误!");
-			return rm;
-		}
-		if(code == null || "".equals(code)){
-			return new ResultMsg(false, ResultMsg.ERROR, "验证码不能为空!",null);
-		}
-		Calendar nowTime = Calendar.getInstance();
-		nowTime.setTime(verificationDate);
-		nowTime.add(Calendar.MINUTE, 5);
-		Date verData = nowTime.getTime();
-		if(!verificationCode.equals(code)){
-			logger.info("openid="+member.getUserOpenid()+"phone:"+member.getUserTel()+"=验证码不正确,请重新输入");
-			return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确,请重新输入!",null);
-		}
-		if((verData.getTime() < System.currentTimeMillis())){
-			return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效,请重新获取!",null);
-		}
-
-		ResultMsg msg = new ResultMsg();
-		member.setUserOpenid(m.getUserOpenid());
-		Integer  flag = memberService.nowUpdateUserByOpenId(member);
-		if (flag > 0 ) {
-			msg.setResultCode(ResultInfo.SUCCESSCODE);
-			msg.setStatus(true);
-			return msg;
-		} else {
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("修改电话号码失败");
-			return msg;
-		}
-	}
-
-	/**
-	 * 发送短信
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/send_phone")
-	public ResultMsg sendPhone(HttpServletRequest request,String phone) throws Exception {
-		ResultMsg msg = new ResultMsg();
-
-		if(phone.trim().length() != 11){
-			msg.setMessage("电话号码错误!");
-			return msg;
-		}
-
-		Member m = WechatUtils.getUserBySession(request);
-
-		//获取验证码
-		String num = RandomUtil.getRandom();
-		//使用request对象的getSession()获取session,如果session不存在则创建一个
-		HttpSession session = request.getSession();
-		String text = MessageFormat.format(ImberryConfig.PROBATION_VERIFICATION_CODE, num);
-		String result = codeService.sendOtherCMS(phone, text);
-
-		//将数据存储到session中
-		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);
-			msg.setResultCode(ResultInfo.SUCCESSCODE);
-			msg.setStatus(true);
-			return msg;
-		} else {
-			logger.info("短信发送失败:" + result);
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("短信发送失败");
-			return msg;
-		}
-	}
-	
-	/**
-	 * 前台根据openid获取用户信息
-	 * create date 2016年6月2日
-	 * @param openid
-	 * @return
-	 */
-	@RequestMapping("/memberInfo")
-	@ResponseBody
-	public ResultMsg getMemberInfo(HttpServletRequest req,
-			@RequestParam(value="openid",defaultValue= "", required=false)String openid){
-		ResultMsg rm = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(req);
-		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-		
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setData(member);
-		return rm;
-	}
-	
 }

+ 348 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/UserHandler.java

@@ -0,0 +1,348 @@
+package com.iamberry.wechat.handles.member;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.agent.AgentMemberDto;
+import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.agent.AgentMemberService;
+import com.iamberry.wechat.face.agent.AgentOrderService;
+import com.iamberry.wechat.face.coupon.CouponItemService;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.face.order.CodeService;
+import com.iamberry.wechat.handles.agent.AgentHandler;
+import com.iamberry.wechat.service.ActivityUtil;
+import com.iamberry.wechat.service.ImberryConfig;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.payUtil.RandomUtil;
+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;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.text.MessageFormat;
+import java.util.*;
+
+@Controller
+@RequestMapping("/wechat/user")
+public class UserHandler {
+    private static LinkedList<Map> sendList = new LinkedList<>();
+    private static final int MaxSize = 20;
+
+    private Logger logger = LoggerFactory.getLogger(UserHandler.class);
+    @Autowired
+    private MemberService memberService;			//会员service
+    @Autowired
+    private AgentMemberService agentMemberService;	//微代理会员service
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private CouponItemService couponItemService;
+
+    /**
+     * 会员中心页面
+     * 2016年4月21日
+     * @author 穆再兴
+     * @return
+     */
+    @RequestMapping("/member")
+    @ResponseBody
+    public ResultMsg getMemberInfo(HttpServletRequest req){
+        ResultMsg rm = new ResultMsg();
+        Member member = new Member();
+        String openId = req.getParameter("openId");
+        if(openId != null && !openId.equals("")){
+            member = memberService.getMemberByUserOpenId(openId);
+        }else{
+            member = WechatUtils.getUserBySession(req);
+        }
+        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+        AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
+        agentMember.setUserIsVip(member.getUserIsVip());
+        agentMember.setUserArrange(member.getUserArrange());
+        agentMember.setUser38Interests(2);
+        agentMember.setUserSurplusIntegral(member.getUserSurplusIntegral());	//userSurplusIntegral
+        agentMember.setUserTel(member.getUserTel());
+        agentMember.setUserSex(member.getUserSex());
+        agentMember.setUserBirthDate(member.getUserBirthDate());
+        agentMember.setUserName(member.getUserName());
+
+        CouponItemDto couponItemDto = new CouponItemDto();
+        couponItemDto.setCouponVipExclusive(1);
+        couponItemDto.setUseropenid(member.getUserOpenid());
+        couponItemDto.setBeginDate(new Date());
+        couponItemDto.setCouponUseStatus(1);
+        Integer couponCount = couponItemService.getCouponItemCount(couponItemDto);
+
+        CouponItemDto vipCouponItemDto = new CouponItemDto();
+        vipCouponItemDto.setCouponVipExclusive(2);
+        vipCouponItemDto.setUseropenid(member.getUserOpenid());
+        vipCouponItemDto.setBeginDate(new Date());
+        vipCouponItemDto.setCouponUseStatus(1);
+        Integer couponVipCount = couponItemService.getCouponItemCount(vipCouponItemDto);
+
+        agentMember.setCouponCount(couponCount);
+        agentMember.setCouponVipCount(couponVipCount);
+
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setStatus(true);
+        rm.setData(agentMember);
+        return rm;
+    }
+
+    /**
+     * 完善用户信息
+     * @return
+     */
+    @RequestMapping("/updateMemberInfo")
+    @ResponseBody
+    public ResultMsg updateMemberInfo(HttpServletRequest request,Member member,String code){
+        ResultMsg rm = new ResultMsg();
+        Member m = WechatUtils.getUserBySession(request);
+
+        m = memberService.getMemberByUserOpenId(m.getUserOpenid());
+        if(m.getUserIsVip() == 2 && m.getUserArrange() == 1){
+            return new ResultMsg(false, ResultMsg.ERROR, "您已经是会员了!",null);
+        }
+
+        if(m.getUserOpenid()== null || "".equals(m.getUserOpenid())){
+            return new ResultMsg(false,  ResultMsg.ERROR, "完善信息失败-用户OpenId为空",null);
+        }
+        if(member == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,用户信息为空,请联系公众号客服!",null);
+        }
+
+        //姓名
+        if(member.getUserName() == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,姓名不能为空!",null);
+        }
+        //性别
+        if(member.getUserSex() == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,性别不能为空!",null);
+        }
+        //生日	userBirthDate
+        if(member.getUserBirthDate() == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,生日不能为空!",null);
+        }
+        //手机号码
+        if(member.getUserTel() == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,手机号码为空!",null);
+        }
+        //验证码
+        if(code == null || "".equals(code)){
+            return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败,验证码为空!",null);
+        }
+
+        int indesxOf = 0;
+        for (int i=0;i<sendList.size();i++) {
+            Map itemMap = sendList.get(i);
+            String openid = (String) itemMap.get("verification_openId");
+            if(openid.equals(m.getUserOpenid())){
+                indesxOf = i;
+            }
+        }
+        Map verificMemberPhoneMap = sendList.get(indesxOf);
+
+        //使用request对象的getSession()获取session,如果session不存在则创建一个
+//		HttpSession session = request.getSession();
+//		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);
+        }
+        if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
+            rm.setMessage(ResultMsg.ERROR);
+            rm.setMessage("电话号码错误!");
+            return rm;
+        }
+        if(code == null || "".equals(code)){
+            return new ResultMsg(false, ResultMsg.ERROR, "验证码为空!",null);
+        }
+        Calendar nowTime = Calendar.getInstance();
+        nowTime.setTime(verificationDate);
+        nowTime.add(Calendar.MINUTE, 5);
+        Date verData = nowTime.getTime();
+        if(!verificationCode.equals(code)){
+            logger.info("openid="+member.getUserOpenid()+"phone:"+member.getUserTel()+"=验证码不正确,请重新输入");
+            return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确,请重新输入!",null);
+        }
+        if((verData.getTime() < System.currentTimeMillis())){
+            return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效,请重新获取!",null);
+        }
+
+        ResultMsg msg = new ResultMsg();
+        member.setUserOpenid(m.getUserOpenid());
+        member.setUserIsVip(2);	//是否为vip :1:非vip  2:vip
+        member.setUserArrange(1);	////1:已整理  2:未整理
+        Integer  flag = memberService.becomeVipByOpenId(member);
+        if (flag > 0 ) {
+            sendList.remove(indesxOf);
+            msg.setResultCode(ResultInfo.SUCCESSCODE);
+            msg.setStatus(true);
+            return msg;
+        } else {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("成为会员失败");
+            return msg;
+        }
+    }
+
+
+    /**
+     * 修改手机号码
+     * @return
+     */
+    @RequestMapping("/updateMemberPhone")
+    @ResponseBody
+    public ResultMsg updateMemberPhone(HttpServletRequest request,Member member,String code){
+        ResultMsg rm = new ResultMsg();
+        Member m = WechatUtils.getUserBySession(request);
+
+        //手机号码
+        if(member.getUserTel() == null){
+            return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败,手机号码为空!",null);
+        }
+        //验证码
+        if(code == null || "".equals(code)){
+            return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败,验证码为空!",null);
+        }
+
+        int indesxOf = 0;
+        for (int i=0;i<sendList.size();i++) {
+            Map itemMap = sendList.get(i);
+            String openid = (String) itemMap.get("verification_openId");
+            if(openid.equals(m.getUserOpenid())){
+                indesxOf = i;
+            }
+        }
+        Map verificMemberPhoneMap = sendList.get(indesxOf);
+        //使用request对象的getSession()获取session,如果session不存在则创建一个
+//		HttpSession session = request.getSession();
+//		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);
+        }
+        if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
+            rm.setMessage(ResultMsg.ERROR);
+            rm.setMessage("修改手机号码失败-手机号码错误!");
+            return rm;
+        }
+        if(code == null || "".equals(code)){
+            return new ResultMsg(false, ResultMsg.ERROR, "验证码不能为空!",null);
+        }
+        Calendar nowTime = Calendar.getInstance();
+        nowTime.setTime(verificationDate);
+        nowTime.add(Calendar.MINUTE, 5);
+        Date verData = nowTime.getTime();
+        if(!verificationCode.equals(code)){
+            logger.info("openid="+member.getUserOpenid()+"phone:"+member.getUserTel()+"=验证码不正确,请重新输入");
+            return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确,请重新输入!",null);
+        }
+        if((verData.getTime() < System.currentTimeMillis())){
+            return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效,请重新获取!",null);
+        }
+
+        ResultMsg msg = new ResultMsg();
+        member.setUserOpenid(m.getUserOpenid());
+        Integer  flag = memberService.nowUpdateUserByOpenId(member);
+        if (flag > 0 ) {
+            sendList.remove(indesxOf);
+            msg.setResultCode(ResultInfo.SUCCESSCODE);
+            msg.setStatus(true);
+            return msg;
+        } else {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("修改电话号码失败");
+            return msg;
+        }
+    }
+
+    /**
+     * 发送短信
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/send_phone")
+    public ResultMsg sendPhone(HttpServletRequest request,String phone) throws Exception {
+        ResultMsg msg = new ResultMsg();
+
+        if(phone.trim().length() != 11){
+            msg.setMessage("电话号码错误!");
+            return msg;
+        }
+
+        Member m = WechatUtils.getUserBySession(request);
+
+        //获取验证码
+        String num = RandomUtil.getRandom();
+        //使用request对象的getSession()获取session,如果session不存在则创建一个
+        HttpSession session = request.getSession();
+        String text = MessageFormat.format(ImberryConfig.PROBATION_VERIFICATION_CODE, num);
+        String result = codeService.sendOtherCMS(phone, text);
+
+        //将数据存储到session中
+        Map verificMemberPhoneMap = new HashMap();
+        verificMemberPhoneMap.put("verification_openId",m.getUserOpenid());
+        verificMemberPhoneMap.put("verification_code",num);
+        verificMemberPhoneMap.put("verification_tel",phone);
+        verificMemberPhoneMap.put("verification_date",new Date());
+
+        sendList.add(verificMemberPhoneMap);
+        if(sendList.size() > MaxSize){
+            sendList.removeFirst();
+        }
+//		session.setAttribute("verification_tel_"+m.getUserOpenid(),verificMemberPhoneMap);
+
+        if ("SUCCESS".equals(result)) {
+            logger.info("短信发送成功,验证码为:" + num);
+            msg.setResultCode(ResultInfo.SUCCESSCODE);
+            msg.setStatus(true);
+            return msg;
+        } else {
+            logger.info("短信发送失败:" + result);
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("短信发送失败");
+            return msg;
+        }
+    }
+
+    /**
+     * 前台根据openid获取用户信息
+     * create date 2016年6月2日
+     * @param openid
+     * @return
+     */
+    @RequestMapping("/memberInfo")
+    @ResponseBody
+    public ResultMsg getMemberInfo(HttpServletRequest req,
+                                   @RequestParam(value="openid",defaultValue= "", required=false)String openid){
+        ResultMsg rm = new ResultMsg();
+        Member member = WechatUtils.getUserBySession(req);
+        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(member);
+        return rm;
+    }
+
+}

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

@@ -650,8 +650,7 @@ public class MQTask implements InitializingBean {
 							"欢迎关注WaterO水时代。现在注册会员,享受多重会员权益:\\\\r\\\\n" +
 									"1.送T1/T2滤芯\\\\r\\\\n" +
 									"2.终身享受购买滤芯套装减免100元\\\\r\\\\n" +
-									"3.注册即送100积分,下单可抵扣10元\\\\r\\\\n" +
-									"\\\\r\\\\n",
+									"3.注册即送100积分,下单可抵扣10元",
 							"服务中心-会员中心-成为会员",
 							"400-8006692",
 							"赶紧注册会员吧!更多惊喜等你来!",

+ 4 - 0
watero-wechat-web/src/main/resources/ioc.xml

@@ -27,6 +27,10 @@
     <!-- 配置springContextHolder -->
     <bean class="com.iamberry.zk.SpringContextHolder" lazy-init="false" />
 
+	<!-- 加载静态资源 -->
+	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
+
+
 	<!-- 开启注解启动 -->
     <task:annotation-driven executor="asyncExecutor" scheduler="schedulerExecutor"/>
 	<task:executor id="asyncExecutor" pool-size="20" queue-capacity="10"/>