优化营期相关接口

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

@@ -8,7 +8,7 @@ import com.fs.course.domain.FsUserCourseVideoRedPackage;
 import com.fs.course.param.CompanyRedPacketParam;
 import com.fs.course.param.FsBatchPeriodRedPackageParam;
 import com.fs.course.param.PeriodCountParam;
-import com.fs.course.param.PeriodRedPacketParam;
+import com.fs.course.vo.PeriodRedPacketVO;
 import com.fs.course.service.IFsUserCoursePeriodDaysService;
 import com.fs.course.service.IFsUserCourseVideoRedPackageService;
 import com.fs.course.vo.FsPeriodCountVO;
@@ -152,7 +152,7 @@ public class FsUserCoursePeriodController extends BaseController {
     @ApiOperation("获取设置红包金额列表")
     @GetMapping("/redPacketList")
     public R getPeriodRedPacketList(Long periodId, Long companyId) {
-        List<PeriodRedPacketParam> periodRedPacketList = fsUserCoursePeriodDaysService.getPeriodRedPacketList(periodId, companyId);
+        List<PeriodRedPacketVO> periodRedPacketList = fsUserCoursePeriodDaysService.getPeriodRedPacketList(periodId, companyId);
         return R.ok().put("data", periodRedPacketList);
     }
 

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

@@ -5,7 +5,7 @@ import java.util.Set;
 
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.param.CompanyRedPacketParam;
-import com.fs.course.param.PeriodRedPacketParam;
+import com.fs.course.vo.PeriodRedPacketVO;
 import com.fs.course.vo.FsUserCoursePeriodVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -95,7 +95,7 @@ public interface FsUserCoursePeriodMapper
      */
     List<CompanyRedPacketParam> selectCompanyByPeriod(@Param("periodId")Long periodId);
 
-    List<PeriodRedPacketParam> selectPeriodRedPacket(@Param("periodId")Long periodId, @Param("companyId")Long companyId);
+    List<PeriodRedPacketVO> selectPeriodRedPacket(@Param("periodId")Long periodId, @Param("companyId")Long companyId);
 
     /**
      * 根据营期ids批量获取营期数据

fs-service-system/src/main/java/com/fs/course/service/IFsUserCoursePeriodDaysService.java

@@ -6,9 +6,8 @@ import com.fs.common.core.domain.R;
 import com.fs.course.domain.FsUserCoursePeriodDays;
 import com.fs.course.param.CompanyRedPacketParam;
 import com.fs.course.param.PeriodCountParam;
-import com.fs.course.param.PeriodRedPacketParam;
+import com.fs.course.vo.PeriodRedPacketVO;
 import com.fs.course.vo.FsPeriodCountVO;
-import com.fs.course.vo.newfs.FsCourseAnalysisCountVO;
 
 /**
  * 营期课程Service接口
@@ -83,7 +82,7 @@ public interface IFsUserCoursePeriodDaysService extends IService<FsUserCoursePer
      * @param companyId 公司id
      * @return
      */
-    List<PeriodRedPacketParam> getPeriodRedPacketList(Long periodId, Long companyId);
+    List<PeriodRedPacketVO> getPeriodRedPacketList(Long periodId, Long companyId);
 
     /**
      * 根据营期按课程统计

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

@@ -19,7 +19,7 @@ import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.mapper.FsUserCoursePeriodMapper;
 import com.fs.course.param.CompanyRedPacketParam;
 import com.fs.course.param.PeriodCountParam;
-import com.fs.course.param.PeriodRedPacketParam;
+import com.fs.course.vo.PeriodRedPacketVO;
 import com.fs.course.vo.FsPeriodCountVO;
 import com.fs.course.vo.newfs.FsCourseAnalysisCountVO;
 import com.fs.store.mapper.FsUserMapper;
@@ -167,7 +167,7 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
     }
 
     @Override
-    public List<PeriodRedPacketParam> getPeriodRedPacketList(Long periodId, Long companyId) {
+    public List<PeriodRedPacketVO> getPeriodRedPacketList(Long periodId, Long companyId) {
         return fsUserCoursePeriodMapper.selectPeriodRedPacket(periodId, companyId);
     }
 
@@ -223,7 +223,7 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         FsCourseAnalysisCountVO redPacketVO = redPacketMap.getOrDefault(v.getVideoId(), countVO);
         FsCourseAnalysisCountVO answerVO = answerMap.getOrDefault(v.getVideoId(), countVO);
         //单独赋值
-        countVO.setVideoId(v.getVideoId()).setCourseWatchNum(courseVO.getCourseWatchNum()).setCourseCompleteNum(courseVO.getCourseWatchNum())
+        countVO.setVideoId(v.getVideoId()).setCourseWatchNum(courseVO.getCourseWatchNum()).setCourseCompleteNum(courseVO.getCourseCompleteNum())
                 .setCompleteRate(courseVO.getCompleteRate() != null ? courseVO.getCompleteRate() : new BigDecimal(BigInteger.ZERO))
                 .setCourseWatchTimes(courseVO.getCourseWatchTimes()).setCourseCompleteTimes(courseVO.getCourseCompleteTimes());
         countVO.setRedPacketNum(redPacketVO.getRedPacketNum())

fs-service-system/src/main/java/com/fs/course/vo/FsPeriodCountVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 @Data
 @ApiModel
 public class FsPeriodCountVO {
@@ -21,6 +22,9 @@ public class FsPeriodCountVO {
     @ApiModelProperty(value = "视频标题")
     private String title;
 
+    @ApiModelProperty(value = "营期日期")
+    private LocalDate dayDate;
+
     @ApiModelProperty(value = "统计明细")
     private FsCourseAnalysisCountVO countDetailsVO;
 

fs-service-system/src/main/java/com/fs/course/param/PeriodRedPacketParam.java → fs-service-system/src/main/java/com/fs/course/vo/PeriodRedPacketVO.java

@@ -1,14 +1,15 @@
-package com.fs.course.param;
+package com.fs.course.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 @Data
 @ApiModel("营期红包金额列表")
-public class PeriodRedPacketParam implements Serializable {
+public class PeriodRedPacketVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "课程id")
@@ -23,6 +24,9 @@ public class PeriodRedPacketParam implements Serializable {
     @ApiModelProperty(value = "视频名称")
     private String videoName;
 
+    @ApiModelProperty(value = "营期日期")
+    private LocalDate dayDate;
+
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 

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

@@ -175,10 +175,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where fcp.period_id = #{periodId}
     </select>
 
-    <select id="selectPeriodRedPacket" resultType="com.fs.course.param.PeriodRedPacketParam">
-
+    <select id="selectPeriodRedPacket" resultType="com.fs.course.vo.PeriodRedPacketVO">
         SELECT
-            a.*,
+            DISTINCT a.*,
             c.course_name,
             cv.title videoName,
             ifnull ( fvrp.red_packet_money, 0 ) AS amount
@@ -202,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHERE
                     a.period_id = #{periodId}
             )
+          and a.period_id = #{periodId}
     </select>
 
     <select id="selectFsUserCoursePeriodsByIds" resultType="FsUserCoursePeriod">