Selaa lähdekoodia

很久之前的的需求,益寿缘侧边栏相关的

cgp 5 päivää sitten
vanhempi
commit
6983df15e8

+ 4 - 0
fs-service/src/main/java/com/fs/course/param/FsCourseLinkMiniParam.java

@@ -9,8 +9,12 @@ public class FsCourseLinkMiniParam {
 
     private String qwUserId;
 
+    //主体id
     private String corpId;
 
+    //应用id(等价于agentId)
+    private String appAgentId;
+
     private Long courseId;
 
     private String title;//视频标题

+ 16 - 2
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -2239,7 +2239,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         String linkByMiniApp = createLinkByMiniApp(new Date(), param.getCourseId(), param.getVideoId(), qwUser, param.getExternalUserId(),2,null,0);
 
         JSONObject news = new JSONObject(true);
-        news.put("miniprogramAppid", qwCompany.getMiniAppId());
+        // 获取配置的小程序id
+        QwAppMiniProgramRelation qwAppMiniProgramRelation = qwAppMiniProgramRelationMapper.selectQwAppMiniProgramRelationByAgentIdAndCorpId(param.getAppAgentId(), param.getCorpId());
+        if (qwAppMiniProgramRelation == null){
+            log.error("createMiniLink()未找到侧边栏配置的小程序,appAgentId:{},corpId:{}", param.getAppAgentId(), param.getCorpId());
+            news.put("miniprogramAppid", qwCompany.getMiniAppId());
+        }else{
+            news.put("miniprogramAppid", qwAppMiniProgramRelation.getMiniAppId());
+        }
         news.put("miniprogramTitle", param.getTitle());
         news.put("miniprogramPicUrl", config.getSidebarImageUrl());
         news.put("miniprogramPage", linkByMiniApp);
@@ -2534,7 +2541,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         String linkByMiniApp = createLinkByMiniApp(new Date(), param.getCourseId(), param.getVideoId(), qwUser, param.getExternalUserId(),2,null,1);
 
         JSONObject news = new JSONObject(true);
-        news.put("miniprogramAppid", qwCompany.getMiniAppId());
+        // 获取配置的小程序id
+        QwAppMiniProgramRelation qwAppMiniProgramRelation = qwAppMiniProgramRelationMapper.selectQwAppMiniProgramRelationByAgentIdAndCorpId(param.getAppAgentId(), param.getCorpId());
+        if (qwAppMiniProgramRelation == null){
+            log.error("createRoomMiniLink()未找到侧边栏配置的小程序,appAgentId:{},corpId:{}", param.getAppAgentId(), param.getCorpId());
+            news.put("miniprogramAppid", qwCompany.getMiniAppId());
+        }else{
+            news.put("miniprogramAppid", qwAppMiniProgramRelation.getMiniAppId());
+        }
         news.put("miniprogramTitle", param.getTitle());
         news.put("miniprogramPicUrl", config.getSidebarImageUrl());
         news.put("miniprogramPage", linkByMiniApp);

+ 2 - 0
fs-service/src/main/java/com/fs/qw/param/QwGroupMsgParam.java

@@ -122,4 +122,6 @@ public class QwGroupMsgParam {
     /** 创建人 */
     private String createName;
 
+    //应用id(等价于agentId)
+    private String appAgentId;
 }

+ 13 - 3
fs-service/src/main/java/com/fs/qw/service/impl/QwGroupMsgServiceImpl.java

@@ -114,6 +114,9 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
     @Autowired
     private CloudHostProper cloudHostProper;
 
+    @Autowired
+    private QwAppMiniProgramRelationMapper qwAppMiniProgramRelationMapper;
+
     /**
      * 查询客户群发记录主
      *
@@ -759,16 +762,23 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
         }
 
         String linkByMiniApp = createLinkByMiniAppGeneral(new Date(), qwGroupMsgParam.getCourseId(), qwGroupMsgParam.getVideoId(), qwUser, 0L,2,null,1);
-
+        // 获取配置的小程序id
+        QwAppMiniProgramRelation qwAppMiniProgramRelation = qwAppMiniProgramRelationMapper.selectQwAppMiniProgramRelationByAgentIdAndCorpId(qwGroupMsgParam.getAppAgentId(), qwGroupMsgParam.getCorpId());
+        if (qwAppMiniProgramRelation == null){
+            log.info("sendSidebarOfficial()未找到侧边栏配置的小程序,appAgentId:{},corpId:{}", qwGroupMsgParam.getAppAgentId(), qwGroupMsgParam.getCorpId());
+            msgTemplate.setMiniprogramAppid(qwCompany.getMiniAppId());
+        }else{
+            msgTemplate.setMiniprogramAppid(qwAppMiniProgramRelation.getMiniAppId());
+        }
         msgTemplate.setSender(qwGroupMsgParam.getSender().trim());
-        msgTemplate.setMiniprogramAppid(qwCompany.getMiniAppId());
+        //msgTemplate.setMiniprogramAppid(qwCompany.getMiniAppId());
         msgTemplate.setMiniprogramTitle(qwGroupMsgParam.getMiniprogramTitle());
         msgTemplate.setMiniprogramPicMediaId(mediaId);
         msgTemplate.setMiniprogramPage(linkByMiniApp);
 
         qwGroupMsgItem.setMsgType(3);
         qwGroupMsgItem.setMiniprogramTitle(qwGroupMsgParam.getMiniprogramTitle());
-        qwGroupMsgItem.setMiniprogramAppid(qwCompany.getMiniAppId());
+        //qwGroupMsgItem.setMiniprogramAppid(qwCompany.getMiniAppId());
         qwGroupMsgItem.setMiniprogramPicUrl(qwGroupMsgParam.getMiniprogramPicUrl());
         qwGroupMsgItem.setMiniprogramPicMediaId(mediaId);
         qwGroupMsgItem.setMiniprogramPage(linkByMiniApp);