修改yml

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

@@ -1987,14 +1987,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             duration = Objects.isNull(watchLog) ? 0 : watchLog.getDuration();
         }
 //
-        if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
-            // 查询视频是否设置了红包，没有就不提示
-            Integer fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
-            if(fsUserCourseVideoRedPackage>0){
-                tipsTime = courseVideoDetails.getDuration() / 3;
-                tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
-            }
-        }
+//        if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
+//            // 查询视频是否设置了红包，没有就不提示
+//            Integer fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
+//            if(fsUserCourseVideoRedPackage>0){
+//                tipsTime = courseVideoDetails.getDuration() / 3;
+//                tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
+//            }
+//        }
         vo.setTipsTime(tipsTime);
         vo.setTipsTime2(tipsTime2);
         //判断是否完课

fs-user-app/src/main/java/com/fs/app/controller/store/WxUserScrmController.java

@@ -317,8 +317,12 @@ public class WxUserScrmController extends AppBaseController {
                 else{
                     //写入
                     user=new FsUserScrm();
-                    user.setPhone(phoneNoInfo.getPhoneNumber());
-                    user.setNickName("微信用户"+phoneNoInfo.getPhoneNumber().substring(phoneNoInfo.getPhoneNumber().length()-4));
+                    if(StringUtils.isNotEmpty(phoneNoInfo.getPhoneNumber())){
+                        user.setPhone(phoneNoInfo.getPhoneNumber());
+                        user.setNickName("微信用户"+phoneNoInfo.getPhoneNumber().substring(phoneNoInfo.getPhoneNumber().length()-4));
+                    }else{
+                        user.setNickName("微信用户");
+                    }
                     user.setAvatar("https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230725/a848605591384ec29d49773dd58d9345.jpg");
                     user.setStatus(1);
                     user.setMaOpenId(session.getOpenid());