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

Mp server test

See merge request quanshu/mp-server!1020

mp-service/src/main/java/com/qs/mp/framework/domain/WxSubscribeMessage.java

@@ -82,7 +82,7 @@ public class WxSubscribeMessage {
      * @param marketing
      */
     public void buildMarketingHelpSuccessMessage(Marketing marketing){
-        template_id = "92xxL8XTRPLROyNUtmN04OT0kyq4iwSCH3sz-j6zbZs";
+        template_id = "b2mMyGHeNQ03D3CZl3iUkDxY0F94ytRAUWgoCKq2Nik";
         page = "/packageOperate/activity/index?id=" + marketing.getId();
 
         /**
@@ -92,7 +92,7 @@ public class WxSubscribeMessage {
          * 温馨提示
          * {{thing3.DATA}}
          */
-        data.put("thing1", new WeappDataValue(marketing.getTitle()));
+        data.put("thing9", new WeappDataValue(marketing.getTitle()));
         data.put("thing3", new WeappDataValue("获得一个抽奖码,点击查看>>"));
     }
 
@@ -123,7 +123,7 @@ public class WxSubscribeMessage {
          * 活动开奖消息
          */
     public void buildMarketingLotterySuccessMessage(Marketing marketing){
-        template_id = "3y_My-yRmqmGd3-f-vAwNaK4LQeehzXBSNDi_5wcnFI";
+        template_id = "bEdEYrjbE6r0647j8o9bgWqSrIqcRJLmaiqqxYkg1-Y";
         page = "/packageOperate/activity/record?id=" + marketing.getId();
         /**
          * 活动名称
@@ -133,7 +133,7 @@ public class WxSubscribeMessage {
          * {{thing5.DATA}}
          */
         data.put("thing1", new WeappDataValue(marketing.getTitle()));
-        data.put("thing5", new WeappDataValue("看看你中奖了吗?"));
+        data.put("thing4", new WeappDataValue("看看你中奖了吗?"));
     }
 
 

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;
@@ -57,10 +58,14 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
   @Override
   public void sendMarketingHelp(Long userId, Marketing marketing) {
     String openId = getOpenIdByUserId(userId);
+    SysUser sysUser = sysUserService.selectUserById(userId);
+    if (sysUser != null) {
+      openId = sysUser.getMsdqOpenId();
+    }
     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);
   }
@@ -68,10 +73,14 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
   @Override
   public boolean sendMarketingLottery(Long userId, Marketing marketing) {
     String openId = getOpenIdByUserId(userId);
+    SysUser sysUser = sysUserService.selectUserById(userId);
+    if (sysUser != null) {
+      openId = sysUser.getMsdqOpenId();
+    }
     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);
   }
@@ -83,7 +92,7 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
 
   private boolean sendNotify(Long userId, String bizId, WxSubscribeMessage message) {
     // 获取access_token
-    String accessToken = appTokenService.getAccessToken(userAppId);
+    String accessToken = appTokenService.getAccessToken(AppSourceEnum.MSDQ.getAppId());
     String res = HttpUtils.sendPost(
         "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + accessToken,
         JSON.toJSONString(message));