Merge branch 'dev' into 'mp-server-test'

订阅模板切换

See merge request quanshu/mp-server!1017

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxSubscribeMessageImpl.java

@@ -2,6 +2,7 @@ package com.qs.mp.framework.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.qs.mp.admin.domain.Marketing;
+import com.qs.mp.common.enums.AppSourceEnum;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.common.utils.http.HttpUtils;
@@ -60,7 +61,7 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
     if (StringUtils.isBlank(openId)) {
       return;
     }
-    WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(userAppId, openId, state);
+    WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(AppSourceEnum.MSDQ.getAppId(), openId, state);
     wxSubscribeMessage.buildMarketingHelpSuccessMessage(marketing);
     this.sendNotify(userId, marketing.getId().toString(), wxSubscribeMessage);
   }
@@ -71,7 +72,7 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
     if (StringUtils.isBlank(openId)) {
       return true;
     }
-    WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(userAppId, openId, state);
+    WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(AppSourceEnum.MSDQ.getAppId(), openId, state);
     wxSubscribeMessage.buildMarketingLotterySuccessMessage(marketing);
     return this.sendNotify(userId, marketing.getId().toString(), wxSubscribeMessage);
   }