2019双旦活动推送修改

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

@@ -265,45 +265,45 @@ public class ResultInfo {
 	/**
 	 * 返现到账通知消息模版
 	 */
-	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, order:{'color':'#173177','value':'orderValueIamberry'}, 'money':{'color':'#173177', 'value':'moneyValueIamberry'}, 'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#000000','value':'firstValueIamberry'}, order:{'color':'#000000','value':'orderValueIamberry'}, 'money':{'color':'#000000', 'value':'moneyValueIamberry'}, 'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 	
 	/** 	 包裹通知 	*/
-	public static String ORDERPACKAGETEMP = "{'first':{'color':'#173177', 'value':'firstValueOrder'}, 'order_id':{'color':'#173177','value':'orderIdValueOrder'}, 'package_id':{'color':'#173177','value':'orderValuePackageId'}, 'remark':{'color':'#173177', 'value':'orderRemarkValue'}}";
+	public static String ORDERPACKAGETEMP = "{'first':{'color':'#000000', 'value':'firstValueOrder'}, 'order_id':{'color':'#000000','value':'orderIdValueOrder'}, 'package_id':{'color':'#000000','value':'orderValuePackageId'}, 'remark':{'color':'#000000', 'value':'orderRemarkValue'}}";
 	
 	/**  账户变更通知 	 */
-	public static String INCOMEREMINDTEMP = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'account':{'color':'#173177','value':'accountValueIamberry'}, 'time':{'color':'#173177', 'value':'timeValueIamberry'}, 'type':{'color':'#173177','value':'typeValueIamberry'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	public static String INCOMEREMINDTEMP = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'account':{'color':'#000000','value':'accountValueIamberry'}, 'time':{'color':'#000000', 'value':'timeValueIamberry'}, 'type':{'color':'#000000','value':'typeValueIamberry'},'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 	
 	/**  订单未支付（5分钟）通知 	*/
-	public static String ORDERWEIZHIFU = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'ordertape':{'color':'#173177','value':'ordertapeValue'}, 'ordeID':{'color':'#173177', 'value':'ordeIDVALUE'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	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':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	
 	/** 	 试用申请通知 	 */
-	public static String PROBATIONAPPLYNOTICE = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','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'}}";
 
 	/** 	试用申请成功通知 	 */
-	public static String PROBATIONAPPLYSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','value':'keyword4Value'},'keyword5':{'color':'#173177','value':'keyword5Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String PROBATIONAPPLYSUCCESS = "{'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 PROBATIONPAYSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderMoneySum':{'color':'#173177','value':'orderMoneySumValue'}, 'orderProductName':{'color':'#173177', 'value':'orderProductNameValue'},'Remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String PROBATIONPAYSUCCESS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'orderMoneySum':{'color':'#000000','value':'orderMoneySumValue'}, 'orderProductName':{'color':'#000000', 'value':'orderProductNameValue'},'Remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 	试用订单关闭通知		*/
-	public static String PROBATIONSHUTDOWN = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'transid':{'color':'#173177','value':'transidValue'}, 'fee':{'color':'#173177', 'value':'feeValue'}, 'pay_time':{'color':'#173177','value':'pay_timeValue'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	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':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','value':'keyword4Value'},'keyword5':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 
 	/** 	服务推送 	*/
-	public static String SERVICEPUSH = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'Good':{'color':'#173177','value':'GoodValue'}, 'contentType':{'color':'#173177', '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':'#FF0000','value':'remarkValue'}}";
 	/** 	拼单成功推送 	*/
-	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 PROBATIONSPELLSUCCESS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','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'}}";
+	public static String MEMBERACTIVATION = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 	关注一个月还未注册通知 	*/
-	public static String REGISTERMEMBER = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String REGISTERMEMBER = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 	RST模板消息 statr 	*/
 	/**
@@ -328,15 +328,15 @@ public class ResultInfo {
 	public static String DELIVERY_APPLICATION_FORM="nxUfbukZ-h1kglyqpqo7CbSsA_DMeXSV9r-8d7jV4Mk";
 
 	/** 	订单审核结果通知 	*/
-	public static String ORDERREVIEWRESULTS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	/** 	审核结果通知 	*/
-	public static String REVIEWRESULTS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	/** 	商品入库通知 	*/
-	public static String GOODSWAREHOUSINGNOTICE = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	/** 	提货申请通知	*/
-	public static String APPLICATIONDELIVERYNOTIFICATION = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	/** 	申请单出库通知 	*/
-	public static String DELIVERYAPPLICATIONFORM = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','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':'#FF0000','value':'remarkValue'}}";
 	/** 	我审核列表url 	*/
 	public static String LISTBEREVIEWED = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=2";
 	/** 	我发起列表url 	*/

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

@@ -152,9 +152,13 @@ public class MemberServiceImpl implements MemberService {
 
 		try {
 			sendMessageUtil.servicePush(
-					"亲爱的用户，恭喜您注册成功！100会员积分、100元滤芯套装优惠券、T1/T2滤芯兑换券已发放至您的账户。",
-					"会员积分+会员专享优惠券",
-					"T1/T2滤芯兑换券有效期3个月",
+					"亲爱的用户，恭喜您注册成功！现在就可享受专属会员权益：\\\\r\\\\n" +
+							"1.送T1/T2滤芯\\\\r\\\\n" +
+							"2.终身享受购买滤芯套装减免100元\\\\r\\\\n" +
+							"3.注册即送100积分，下单可抵扣10元\\\\r\\\\n" +
+							"\\\\r\\\\n",
+					"会员积分+会员专享",
+					"T1/T2滤芯专享券有效期3个月",
 					"可在“服务中心-会员中心”查看积分及会员专享优惠券，请及时使用优惠券。",
 					member.getUserOpenid(),
 					ResultInfo.COUPON_URL_2);

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

@@ -148,7 +148,7 @@ public class HomeHandler {
 					}
 					homeService.updateWechatMemberInfoByByOpenid(mem);
 				}
-				logger.info("获取个人信息成功；openid："+m.getUserOpenid());
+//				logger.info("获取个人信息成功；openid："+m.getUserOpenid());
 		}catch (Exception e){
 			logger.error("获取个人信息失败:{}", e);
 		}

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

@@ -523,7 +523,7 @@ public class MQTask implements InitializingBean {
 						member.getUserTel(),
 						String.valueOf(member.getUserSurplusIntegral()),
 						"1、免费领取50元代金券，满99元即可使用，在会员中心-券包即可查看使用。\\\\r\\\\n" +
-								"2、会员生日当天下单购买产品，即可享受3倍积分。" +
+								"2、会员生日当天下单购买产品，即可享受3倍积分。\\\\r\\\\n" +
 								"生日福利仅限生日当天领取和使用，赶快享受你的专属生日礼包吧！",
 						member.getUserOpenid(),
 						ResultInfo.COUPON_URL);
@@ -583,8 +583,8 @@ public class MQTask implements InitializingBean {
 			for (CouponItemDto couponItemDto:couponItemDtoList) {
 				try {
 					sendMessageUtil.servicePush(
-							"亲爱的用户，您的T1/T2滤芯兑换券有效期还有45天",
-							"T1/T2滤芯兑换券",
+							"亲爱的用户，您的T1/T2滤芯专享券即将到期",
+							"T1/T2滤芯专享券",
 							"45天后失效",
 							"可在“服务中心-会员中心-会员专享”查看，请尽快使用。",
 							couponItemDto.getUseropenid(),
@@ -610,8 +610,8 @@ public class MQTask implements InitializingBean {
 			for (CouponItemDto couponItemDto:nowcouponItemDtoList) {
 				try {
 					sendMessageUtil.servicePush(
-							"亲爱的用户，您的T1/T2滤芯兑换券即将到期",
-							"T1/T2滤芯兑换券",
+							"亲爱的用户，您的T1/T2滤芯专享券即将到期",
+							"T1/T2滤芯专享券",
 							"5天后失效",
 							"可在“服务中心-会员中心-会员专享”查看，请尽快使用。",
 							couponItemDto.getUseropenid(),
@@ -645,7 +645,11 @@ public class MQTask implements InitializingBean {
 			for (Member m:memberList) {
 				try {
 					sendMessageUtil.registerMember(
-							"欢迎关注WaterO水时代公众号。现在注册会员，即可赠送100积分，享受购买滤芯年套装直减100元优惠，还送T1/T2滤芯兑换券！",
+							"欢迎关注WaterO水时代。现在注册会员，享受多重会员权益：\\\\r\\\\n" +
+									"1.送T1/T2滤芯\\\\r\\\\n" +
+									"2.终身享受购买滤芯套装减免100元\\\\r\\\\n" +
+									"3.注册即送100积分，下单可抵扣10元\\\\r\\\\n" +
+									"\\\\r\\\\n",
 							"服务中心-会员中心-成为会员",
 							"400-8006692",
 							"赶紧注册会员吧！更多惊喜等你来！",

watero-wechat-web/src/main/webapp/WEB-INF/web.xml

@@ -66,7 +66,7 @@
 	</filter-mapping>
 
 	<!--@WebFilter批注声明一个过滤器。不会定义顺序，如需要定义顺义需要在filter上加入filterName（过滤器的名称），在web来声明 filter-mapping-->
-	<!--故SimpleCORSFilter恢复以前的方式来当过滤器使用-->
+	<!--故SimpleCORSFilter恢复以前的方式来配置过滤器-->
 	<filter>
 		<filter-name>cors</filter-name>
 		<filter-class>com.iamberry.common.web.SimpleCORSFilter</filter-class>