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

订阅模板切换

See merge request quanshu/mp-server!1019

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

@@ -58,6 +58,10 @@ 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;
     }
@@ -69,6 +73,10 @@ 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;
     }