Merge branch 'refs/heads/master-fby'

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -316,7 +316,7 @@ public class FsUserController extends AppBaseController {
         return fsUserService.becomeMember(param);
     }
 
-    @Login
+    //    @Login
     @PostMapping("/userImage")
     @ApiOperation("生成分享会员海报")
     public R createCourseImage(@RequestBody FsUserCourseBeMemberImageParam param) {

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserWatchCourseStatisticsServiceImpl.java

@@ -209,7 +209,7 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
             BigDecimal watchNum = new BigDecimal(vo.getWatchNum());
             BigDecimal userNum = new BigDecimal(vo.getUserNum());
             if(!userNum.equals(BigDecimal.ZERO)){
-                BigDecimal onlineRate = watchNum.divide(userNum, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+                BigDecimal onlineRate = watchNum.divide(userNum, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
                 vo.setOnlineRate(onlineRate);
             } else{
                 vo.setOnlineRate(BigDecimal.ZERO);

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserCourseCountServiceImpl.java

@@ -129,7 +129,7 @@ public class FsUserCourseCountServiceImpl implements IFsUserCourseCountService
             if(fsUserCourseCount != null){
                 data.setLastWatchDate(fsUserCourseCount.getLastWatchDate());
                 data.setStatus(fsUserCourseCount.getStatus());
-                data.setStopWatchDays(fsUserCourseCount.getStopWatchDays());
+//                data.setStopWatchDays(fsUserCourseCount.getStopWatchDays());
             }
         }
 

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ccut.course_id = fcpd.course_id
             AND ccut.video_id = fcpd.video_id
             AND ccut.company_user_id = #{companyUserId}
-        where course.is_del = 0
+        where course.is_del = 0 and fcp.del_flag = 0 and fcpd.del_flag = 0
         AND FIND_IN_SET(#{companyId}, fcp.company_id)
         <if test="periodId != null and periodId !='' ">
             AND fcpd.period_id = #{periodId}

fs-service-system/src/main/resources/mapper/store/FsUserCourseCountMapper.xml

@@ -185,10 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     2
                 WHEN fs_course_watch_log.log_type = 3 THEN
                     3
-                END AS STATUS,
-            DATEDIFF(
-                    DATE_FORMAT( NOW(), '%Y-%m-%d' ),
-                    DATE_FORMAT( fs_course_watch_log.last_heartbeat_time, '%Y-%m-%d' )) AS stop_watch_days
+                END AS STATUS
+--             DATEDIFF(
+--                     DATE_FORMAT( NOW(), '%Y-%m-%d' ),
+--                     DATE_FORMAT( fs_course_watch_log.last_heartbeat_time, '%Y-%m-%d' )) AS stop_watch_days
         FROM
             fs_course_watch_log
         WHERE