爱贝源618

iamberry-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -94,7 +94,7 @@ public class SendMessageUtil {
 //			case 10:  //10、退款申请通知
 //				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.order_refund_msg, date, url);
 //				break;
-			case 11:  //11、母亲节活动，推送模板
+			case 11:  //11、推送模板
 				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.service_push, date, url);
 				break;
 			default:
@@ -247,8 +247,8 @@ public class SendMessageUtil {
 	public void servicePush(String first,String keyword1,String keyword2,String remark,String openId,String url){
 		String temp = ResultInfo.SERVICEPUSH;
 		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("GoodValue",keyword1)
-				.replaceFirst("contentTypeValue",keyword2)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
 				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,11);
 	}

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

@@ -144,7 +144,7 @@ public class ResultInfo {
 	public static String SENDSUCCESS= "{'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':'colorValue','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':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
 
 	/** 退款申请通知 **/
 	//public static String ORDERREFUNDMSG= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";

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

@@ -100,6 +100,8 @@ public class loadResultUtil {
 
 			ResultInfo.yearMsg = prop.getProperty("yearMsg");
 
+			ResultInfo.service_push = prop.getProperty("service_push");			//服务推送模板
+
 		} catch (IOException e) {
 			ResultInfo.SUCCESSINFO="操作成功！";
 			ResultInfo.ERRORINFO="操作失败！";

iamberry-wechat-web/src/main/resources/ResultInfo.properties

@@ -85,4 +85,4 @@ order_apply_return=pnxucPuUygE6epyyC3oPGhjxm2o7mK_B2vLzYxIYXRo
 order_apply_barter=qmj2m-BVyZtEKsKCSBbPlJVSykOr2YScr9pRkPA909w
 order_send_success=Nd6MapQ80Ye4PsQOwJdYljxyPGz6N5gfmGip_KztnhY
 order_refund_msg=KNMyO9uDRrXlhJtdQuqCwH1T_AoMFYBCQUhQrlR1EdQ
-service_push=5hWq6wd6W9HbMZ0ICSRTDyCKh_r_MjpQtWzkQRSKLio
+service_push=HWm_f0WURL-ff76jXEM-PrVXsjnuxde8a_dyCnvtfMM