Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

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

@@ -110,7 +110,14 @@ public class IpadSendServer {
                                         appid = optional2.get().getAppid();
                                         log.info("ID:{}, qwUserId:{}，externalId:{}，找到正常小程序:{}", vo.getId(), vo.getQwUserId(), vo.getExId(), appid);
                                     }else{
-                                        log.info("ID:{}, qwUserId:{}，externalId:{}，没找到小程序:{}", vo.getId(), vo.getQwUserId(), vo.getExId(), appid);
+                                        Optional<CompanyMiniapp> first = listAll.stream().filter(e -> e.getType() == 1).findFirst();
+                                        // 查找备用小程序发送备用记录ID
+                                        if(first.isPresent()){
+                                            appid = first.get().getAppId();
+                                            log.info("ID:{}, qwUserId:{}，externalId:{}，找到备用小程序:{}", vo.getId(), vo.getQwUserId(), vo.getExId(), appid);
+                                        }else{
+                                            log.info("ID:{}, qwUserId:{}，externalId:{}，没找到小程序:{}", vo.getId(), vo.getQwUserId(), vo.getExId(), appid);
+                                        }
                                     }
                                 }
                             }else{

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java

@@ -150,21 +150,21 @@ public class CourseQwController extends AppBaseController {
             long tipsTime = 0L;
             int isFinish = 0;
             int isRedPackage = 0;
+            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
+            if (fsUserCourseVideoRedPackage != null && fsUserCourseVideoRedPackage.getRedPacketMoney() !=null && BigDecimal.ZERO.compareTo(fsUserCourseVideoRedPackage.getRedPacketMoney()) != 0) {
+                isRedPackage = 1;
+            }
             if (param.getLinkType()!=null&&param.getLinkType()==1){
-                return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime);
+                return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime).put("isRedPackage",isRedPackage);
             }
 
             if (param.getIsRoom()!=null&&param.getIsRoom()==1&&param.getQwExternalId()==null){
-                return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime);
+                return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime).put("isRedPackage",isRedPackage);
             }
             // 从Redis中获取观看时长
             String redisKey = "h5user:watch:duration:" + param.getQwUserId()+ ":" + param.getQwExternalId() + ":" + param.getVideoId();
             String durationStr = redisCache.getCacheObject(redisKey);
             FsCourseWatchLog log = courseWatchLogService.getWatchCourseVideo(param.getUserId(),param.getVideoId(),param.getQwUserId(),param.getQwExternalId());
-            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
-            if (fsUserCourseVideoRedPackage != null && fsUserCourseVideoRedPackage.getRedPacketMoney() !=null && BigDecimal.ZERO.compareTo(fsUserCourseVideoRedPackage.getRedPacketMoney()) != 0) {
-                isRedPackage = 1;
-            }
             if (log==null){
                 return R.error("记录不存在，请联系客服!");
             }