fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -60,7 +60,7 @@ public class IpadSendServer {
     private final ICompanyMiniappService companyMiniappService;
     private final IFsCoursePlaySourceConfigService playSourceConfigService;
     private final FsUserMapper fsUserMapper;
-    private static final List<String> PROJECT_NAMES = Arrays.asList("济南联志健康", "北京存在文化","宽益堂");
+    private static final List<String> PROJECT_NAMES = Arrays.asList("济南联志健康", "北京存在文化","宽益堂","医健宝");
     private void sendMiniProgram(BaseVo vo, QwSopCourseFinishTempSetting.Setting content, Map<String, FsCoursePlaySourceConfig> miniMap, Long companyId) {
         // 发送参数原本的appid
         String appid = content.getMiniprogramAppid();
@@ -86,18 +86,25 @@ public class IpadSendServer {
                         // 当前外部联系是否绑定用户数据，如果数据为空则是没看过小程序的新用户，不用去判断小程序，跳过判断
                         if(qwExternalContact.getFsUserId() != null){
                             // 根据用户绑定信息去查询用户信息
-                            FsUser fsUser = fsUserMapper.selectFsUserByUserId(qwExternalContact.getFsUserId());
+                            FsUser fsUser = fsUserMapper.getUserLookAppIdByuserId(qwExternalContact.getFsUserId());//优化升级获取用户登录的appId
                             // 判断用户是否有看过其他的小程序多个
-                            if(StringUtils.isNotEmpty(fsUser.getAppId())){
+                            if(fsUser != null && StringUtils.isNotEmpty(fsUser.getAppId()) && !"".equals( fsUser.getAppId())){
                                 // 获取用户看过的小程序ID集合
                                 List<String> miniAppList = Arrays.asList(fsUser.getAppId().split(","));
                                 // 根据小程序ID查询小程序列表
                                 List<FsCoursePlaySourceConfig> configList = playSourceConfigService.selectByAppIds(miniAppList);
-                                // 筛选出半封禁的小程序数据，得到这个数据然后优先发这个小程序
-                                Optional<FsCoursePlaySourceConfig> optional = configList.stream().filter(e -> e.getStatus() != null && e.getStatus() == 1).findFirst();
+                                //优先筛选半封禁的数据
+                                Optional<FsCoursePlaySourceConfig> optional = configList.stream()
+                                        .filter(e -> e.getStatus() != null && e.getStatus() == 1)
+                                        .findFirst();
+                                //如果没找到半封禁，再找 正常的
+                                if (!optional.isPresent()) {
+                                    optional = configList.stream()
+                                            .filter(e -> e.getStatus() != null && e.getStatus() == 0)
+                                            .findFirst();
+                                }
                                 // 判断是否找到
-                                if(optional.isPresent()){
-                                    // 找到半封禁并且在appid里面存在证明这个客户是打开过小程序，优先发送这个
+                                if (optional.isPresent()) {
                                     appid = optional.get().getAppid();
                                 }
                             }else{

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -15,7 +15,6 @@ import com.fs.his.param.FsUserParam;
 import com.fs.his.vo.FsUserVO;
 import com.fs.his.vo.FsUserExportListVO;
 import com.fs.his.vo.OptionsVO;
-import com.fs.hisStore.domain.FsUserScrm;
 import com.fs.hisStore.vo.FsCompanyUserListQueryVO;
 import com.fs.qw.dto.FsUserTransferParamDTO;
 import com.fs.qw.param.QwFsUserParam;
@@ -443,4 +442,10 @@ public interface FsUserMapper
     @Select("select * from fs_user where ma_open_id=#{openid}")
     FsUser selectFsUserByMaOpenId(String openid);
 
+    /**
+     * 获取用户看过的小程序ID
+     * @param userId 用户ID
+     * @return  FsUser
+     * **/
+    FsUser getUserLookAppIdByuserId(@Param("userId") Long userId);
 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -2264,4 +2264,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getUserLookAppIdByuserId" resultType="FsUser">
+        SELECT
+            fu.user_id,
+            GROUP_CONCAT( fuw.app_id ) appid,
+            fu.create_time
+        FROM
+            fs_user fu
+                LEFT JOIN fs_user_wx fuw ON fu.user_id = fuw.fs_user_id
+                INNER JOIN fs_course_play_source_config sc ON fuw.app_id = sc.appid
+                AND sc.is_del = 0
+                AND sc.`status` != 2
+        WHERE
+            fu.user_id = #{userId}
+    </select>
+
 </mapper>