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

Dev

See merge request quanshu/mp-server!840

mp-common/src/main/java/com/qs/mp/common/enums/AppSourceEnum.java

@@ -14,7 +14,7 @@ public enum AppSourceEnum implements IEnum<Integer> {
     /**
      * 盲票AppId
      */
-    MP(1,"wx8533800e393dbd6b", "7708655ba65f04de2a42f23d20ab4134"),
+    MP(1,"wx8533800e393dbd6b", "f7a104e09d6c2e55445be2a45c4ab551"),
     /**
      * 马上兑券AppId
      */

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

@@ -3,6 +3,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.utils.LogUtil;
+import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.common.utils.http.HttpUtils;
 import com.qs.mp.framework.domain.WxSubscribeMessage;
 import com.qs.mp.framework.service.IAppTokenService;
@@ -45,6 +46,9 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
   @Override
   public boolean sendMarketingStart(Long userId, Marketing marketing) {
     String openId = getOpenIdByUserId(userId);
+    if (StringUtils.isBlank(openId)) {
+      return true;
+    }
     WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(userAppId, openId, state);
     wxSubscribeMessage.buildMarketingStartSuccessMessage(marketing);
     return this.sendNotify(userId, marketing.getId().toString(), wxSubscribeMessage);
@@ -53,6 +57,9 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
   @Override
   public void sendMarketingHelp(Long userId, Marketing marketing) {
     String openId = getOpenIdByUserId(userId);
+    if (StringUtils.isBlank(openId)) {
+      return;
+    }
     WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(userAppId, openId, state);
     wxSubscribeMessage.buildMarketingHelpSuccessMessage(marketing);
     this.sendNotify(userId, marketing.getId().toString(), wxSubscribeMessage);
@@ -61,6 +68,9 @@ public class WxSubscribeMessageImpl implements IWxSubscribeMessage {
   @Override
   public boolean sendMarketingLottery(Long userId, Marketing marketing) {
     String openId = getOpenIdByUserId(userId);
+    if (StringUtils.isBlank(openId)) {
+      return true;
+    }
     WxSubscribeMessage wxSubscribeMessage = new WxSubscribeMessage(userAppId, openId, state);
     wxSubscribeMessage.buildMarketingLotterySuccessMessage(marketing);
     return this.sendNotify(userId, marketing.getId().toString(), wxSubscribeMessage);