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

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

@@ -45,10 +45,7 @@ import java.io.InputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static com.fs.his.utils.PhoneUtil.encryptPhone;
 
@@ -161,7 +158,8 @@ public class FsUserController extends AppBaseController {
     @ApiOperation("首页数据-顶部汇总统计")
     public ResponseResult<FsUserSummaryCountVO> userSummaryCount() {
         long userId = Long.parseLong(getUserId());
-        return ResponseResult.ok(fsUserService.userSummaryCount(userId));
+//        return ResponseResult.ok(fsUserService.userSummaryCount(userId));
+        return ResponseResult.ok();
     }
 
     @Login
@@ -216,7 +214,8 @@ public class FsUserController extends AppBaseController {
             @ApiParam(value = "类型，1-按完播率，2-按正确率", required = true) @RequestParam Integer type
     ) {
         long userId = Long.parseLong(getUserId());
-        return ResponseResult.ok(fsUserService.userRanking(userId, startTime, endTime, periodId, videoId, order, type));
+//        return ResponseResult.ok(fsUserService.userRanking(userId, startTime, endTime, periodId, videoId, order, type));
+        return ResponseResult.ok(new ArrayList<>());
     }
 
     @Login
@@ -231,7 +230,8 @@ public class FsUserController extends AppBaseController {
             @ApiParam(value = "类型，1-按完播率，2-按正确率", required = true) @RequestParam Integer type
     ) {
         long userId = Long.parseLong(getUserId());
-        return ResponseResult.ok(fsUserService.courseRanking(userId, startTime, endTime, courseId, videoId, order, type));
+//        return ResponseResult.ok(fsUserService.courseRanking(userId, startTime, endTime, courseId, videoId, order, type));
+        return ResponseResult.ok(new ArrayList<>());
     }
 
     @Login

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

@@ -2259,7 +2259,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             if("福本源".equals(signProjectName)){
                 return ResponseResult.fail(504, "服务暂时不可用，请联系管理员");
             } else {
-                return ResponseResult.fail(504, "已被拉黑,请联系管理员");
+                return ResponseResult.fail(504, "【"+userCompanyUser.getUserId()+"】已被拉黑,请联系管理员");
             }
         }
 

fs-service/src/main/resources/mapper/course/FsUserCoursePeriodDaysMapper.xml

@@ -42,7 +42,7 @@
                 </foreach>
             </if>
         </where>
-        order by c.course_sort
+        order by a.start_date_time
     </select>
     <select id="selectFsUserCoursePeriodDaysCount" parameterType="FsUserCoursePeriodDays" resultType="java.lang.Long">
         select count(a.id) from fs_user_course_period_days a