Merge branch 'eature/xgh/bug0808' into 'master'

小程序的跳转

See merge request !2109

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/OpenStaffServiceImpl.java

@@ -230,12 +230,12 @@ public class OpenStaffServiceImpl implements OpenStaffService {
             QwOpenResultInitBO bo = initResp.getResult();
             String newUuid = bo.getUuid();
             if (bo.isIs_login()) {
-                this.openStaffMapper.updateByAutoLogin(qwUserId, newUuid);
+                this.openStaffMapper.updateByAutoLogin(openStaffId, newUuid);
                 return newUuid;
             }
             boolean autLogin = OpenUtils.autoLogin(newUuid);
             if (autLogin) {
-                this.openStaffMapper.updateByAutoLogin(qwUserId, newUuid);
+                this.openStaffMapper.updateByAutoLogin(openStaffId, newUuid);
                 return newUuid;
             }
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

@@ -227,7 +227,7 @@ public class QywxSendServiceImpl implements QywxSendService {
             miniprogramMaterialDTO.setPicMediaId(maerialId);
             miniprogramMaterialDTO.setAppid(material.getAppId());
             miniprogramMaterialDTO.setPage(material.getLink());
-           /* if(null != planType && StringUtils.isNotBlank(planId)) {
+            if(null != planType && StringUtils.isNotBlank(planId)) {
                 String url = "qtActivityType="+planType+"&qtActivityId="+planId ;
                 if(material.getLink().contains("?")) {
                     url = "&" + url ;
@@ -235,7 +235,7 @@ public class QywxSendServiceImpl implements QywxSendService {
                     url = "?" +url ;
                 }
                 miniprogramMaterialDTO.setPage(material.getLink()+url);
-            }*/
+            }
             log.info("群发链接={}",material.getLink(),miniprogramMaterialDTO.getPage());
             dto.setMsgType(QywxMediaTypeEnum.MINIPROGRAM.getName());
             dto.setMiniprogram(miniprogramMaterialDTO);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/OpenUtils.java

@@ -141,7 +141,7 @@ public class OpenUtils {
         logger.info("获取当前账号详情={},uuid={}", backJson, uuid);
         JSONObject resultJson = JSONObject.parseObject(backJson);
         int errcode = resultJson.getIntValue("errcode");
-        if (errcode == 500 && resultJson.getString("errmsg").contains("实例不存在")) {
+        if (errcode == 500) {
             return false;
         }
         return true;