bug修复

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

@@ -146,7 +146,7 @@ public class CompanyUserController extends AppBaseController {
             vo.setTodayFinishRate(rate);
 
             // 今日红包金额
-            BigDecimal amount = courseRedPacketLogService.getSumByCompanyUserIdId(u.getUserId());
+            BigDecimal amount = courseRedPacketLogService.getSumByCompanyUserIdId(u.getUserId(), LocalDate.now());
             vo.setTodayRedPacketAmount(amount);
 
             // 是否存在会员转移申请

fs-service/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -1,6 +1,7 @@
 package com.fs.course.mapper;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -152,11 +153,12 @@ public interface FsCourseRedPacketLogMapper
 
     /**
      * 查询红包金额数
-     * @param companyUserId 销售ID
+     * @param
      * @return amount
      */
-    @Select("select ifnull(sum(fcrpl.amount), 0) from fs_course_red_packet_log fcrpl where fcrpl.company_user_id = #{companyUserId}")
-    BigDecimal getSumByCompanyUserIdId(@Param("companyUserId") Long companyUserId);
+    @Select("select ifnull(sum(fcrpl.amount), 0) from fs_course_red_packet_log fcrpl where fcrpl.company_user_id = #{companyUserId} and date(fcrpl.create_time) = #{date}")
+    BigDecimal getSumByCompanyUserIdId(@Param("companyUserId") Long companyUserId, @Param("date") LocalDate date);
+
 
     @Select("SELECT company_id, SUM(amount) as money FROM fs_course_red_packet_log    WHERE status = 0 and create_time >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)  AND create_time < DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY company_id  ")
     List<RedPacketMoneyVO> selectFsCourseAddRedPacketLogByCompany();

fs-service/src/main/java/com/fs/course/service/IFsCourseRedPacketLogService.java

@@ -1,7 +1,9 @@
 package com.fs.course.service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 import com.fs.common.core.domain.R;
 import com.fs.course.domain.FsCourseRedPacketLog;
@@ -73,10 +75,10 @@ public interface IFsCourseRedPacketLogService
 
     /**
      * 查询红包金额数
-     * @param companyUserId 销售ID
+     *
      * @return amount
      */
-    BigDecimal getSumByCompanyUserIdId(Long companyUserId);
+    BigDecimal getSumByCompanyUserIdId(Long companyUserId, LocalDate date);
 
     int getCountByCompanyUserIdId(Long userId);
 

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

@@ -1,6 +1,7 @@
 package com.fs.course.service.impl;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -177,12 +178,12 @@ public class FsCourseRedPacketLogServiceImpl implements IFsCourseRedPacketLogSer
 
     /**
      * 查询红包金额数
-     * @param companyUserId 销售ID
+     * @param
      * @return amount
      */
     @Override
-    public BigDecimal getSumByCompanyUserIdId(Long companyUserId) {
-        return fsCourseRedPacketLogMapper.getSumByCompanyUserIdId(companyUserId);
+    public BigDecimal getSumByCompanyUserIdId(Long companyUserId, LocalDate date) {
+        return fsCourseRedPacketLogMapper.getSumByCompanyUserIdId(companyUserId, date);
     }
 
     @Override

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

@@ -1753,7 +1753,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         }
         return list.stream()
                 .collect(Collectors.toMap(
-                        WatchLogReportVO::getUserId,
+                        WatchLogReportVO::getLogId,
                         Function.identity(),
                         (existing, replacement) -> existing // 当出现重复键时，保留第一个值
                 ));
@@ -1799,7 +1799,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         }
         return list.stream()
                 .collect(Collectors.toMap(
-                        WatchLogReportVO::getUserId,
+                        WatchLogReportVO::getLogId,
                         Function.identity(),
                         (existing, replacement) -> existing // 当出现重复键时，保留第一个值
                 ));

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

@@ -1905,7 +1905,7 @@ FROM
        <where>
         <!-- 只有当传入公司ID参数时才筛选公司 -->
         <if test="companyId != null">
-            period.company_id = #{companyId}
+            c.company_id = #{companyId}
         </if>
         <!-- 训练营 -->
         <if test="trainingCampId != null and trainingCampId != ''">