fix: 联调看课相关接口，修复问题

fs-admin/src/main/java/com/fs/course/controller/FsUserCoursePeriodController.java

@@ -1,6 +1,8 @@
 package com.fs.course.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.fs.common.core.domain.R;
 import com.fs.course.domain.FsUserCoursePeriodDays;
@@ -13,6 +15,9 @@ import com.fs.course.service.IFsUserCoursePeriodDaysService;
 import com.fs.course.service.IFsUserCourseVideoRedPackageService;
 import com.fs.course.vo.FsPeriodCountVO;
 import com.fs.course.vo.FsUserCoursePeriodVO;
+import com.fs.store.vo.h5.FsUserPageListVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -63,11 +68,17 @@ public class FsUserCoursePeriodController extends BaseController {
 
     @PostMapping("/page")
     @ApiOperation("自定义查询主列表分页")
-    public TableDataInfo pageList(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
+    public R pageList(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        startPage();
+//        startPage();
+        PageHelper.startPage(fsUserCoursePeriod.getPageNum(), fsUserCoursePeriod.getPageSize());
         List<FsUserCoursePeriodVO> list = fsUserCoursePeriodService.selectFsUserCoursePeriodPage(fsUserCoursePeriod);
-        return getDataTable(list);
+        PageInfo<FsUserCoursePeriodVO> pageInfo = new PageInfo<>(list);
+        Map<String, Object> result = new HashMap<>();
+        result.put("rows", pageInfo.getList());
+        result.put("total", pageInfo.getTotal());
+        return R.ok(result);
+//        return getDataTable(list);
     }
 
     /**
@@ -182,10 +193,14 @@ public class FsUserCoursePeriodController extends BaseController {
 
     @PostMapping("/periodCount")
     @ApiOperation("营期统计")
-    public TableDataInfo periodCourseCount(@RequestBody PeriodCountParam param) {
-        startPage();
+    public R periodCourseCount(@RequestBody PeriodCountParam param) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsPeriodCountVO> list = fsUserCoursePeriodDaysService.periodCourseCount(param);
-        return getDataTable(list);
+        PageInfo<FsPeriodCountVO> pageInfo = new PageInfo<>(list);
+        Map<String, Object> result = new HashMap<>();
+        result.put("rows", pageInfo.getList());
+        result.put("total", pageInfo.getTotal());
+        return R.ok(result);
     }
 
 }

fs-admin/src/main/java/com/fs/user/FsUserAdminController.java

@@ -1,10 +1,12 @@
 package com.fs.user;
 
 import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.domain.R;
 import com.fs.store.param.h5.FsUserPageListParam;
 import com.fs.store.service.IFsUserService;
 import com.fs.store.vo.h5.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -25,10 +27,14 @@ public class FsUserAdminController extends BaseController {
     @PreAuthorize("@ss.hasPermi('user:fsUser:list')")
     @PostMapping("/list")
     @ApiOperation("会员列表(与移动端使用的相同查询)")
-    public TableDataInfo pageList(@RequestBody FsUserPageListParam param) {
-        startPage();
+    public R pageList(@RequestBody FsUserPageListParam param) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
-        return getDataTable(list);
+        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
+        Map<String, Object> result = new HashMap<>();
+        result.put("rows", pageInfo.getList());
+        result.put("total", pageInfo.getTotal());
+        return R.ok(result);
     }
 
 

fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriod.java

@@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 会员营期对象 fs_user_course_period
@@ -23,6 +21,12 @@ public class FsUserCoursePeriod
 {
     private static final long serialVersionUID = 1L;
 
+    @TableField(exist = false)
+    private Integer pageNum;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+
     /** 营期id */
     private Long periodId;
 

fs-service-system/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -307,7 +307,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
             "where video_id = #{videoId} " +
             "and company_user_id = #{companyUserId} " +
             "and user_id = #{userId} and send_type = 1 ")
-    FsCourseWatchLog getWatchCourseVideoByFsUser(Long userId, Long videoId, Long companyUserId);
+    FsCourseWatchLog getWatchCourseVideoByFsUser(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("companyUserId") Long companyUserId);
 
     /**
      * 聚合查询

fs-service-system/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -68,8 +68,8 @@ public interface FsUserCourseVideoRedPackageMapper
             "ON DUPLICATE KEY UPDATE red_packet_money = VALUES(red_packet_money);")
     void insertOrUpdateFsUserCourseVideoRedPackage(FsUserCourseVideoParam fsUserCourseVideo);
 
-    @Select("select * from fs_user_course_video_red_package where video_id =#{videoId} and company_id = #{companyId}")
-    FsUserCourseVideoRedPackage selectRedPacketByCompanyId(@Param("videoId") Long videoId,@Param("companyId") Long companyId);
+    @Select("select * from fs_user_course_video_red_package where video_id =#{videoId} and company_id = #{companyId} and period_id = #{periodId}")
+    FsUserCourseVideoRedPackage selectRedPacketByCompanyId(@Param("videoId") Long videoId,@Param("companyId") Long companyId, @Param("periodId") Long periodId);
 
     int batchSaveFsUserCourseVideoRedPackage(@Param("list") List<FsUserCourseVideoRedPackage> redPackageList);
 

fs-service-system/src/main/java/com/fs/course/param/FsCourseSendRewardUParam.java

@@ -25,5 +25,6 @@ public class FsCourseSendRewardUParam implements Serializable
     private Integer source=1;//来源 1:h5  2:小程序
     private Integer isRoom;
     private Integer sendType;
+    private Long periodId;
 
 }

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

@@ -728,7 +728,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private R sendRedPacketReward(FsCourseSendRewardUParam param, FsUser user, FsCourseWatchLog log, FsUserCourseVideo video, CourseConfig config) {
         // 确定红包金额
         BigDecimal amount = BigDecimal.ZERO;
-        FsUserCourseVideoRedPackage redPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyId(param.getVideoId(), param.getCompanyId());
+        FsUserCourseVideoRedPackage redPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyId(param.getVideoId(), param.getCompanyId(), param.getPeriodId());
 
         if (redPackage != null) {
             amount = redPackage.getRedPacketMoney();