add

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

@@ -38,7 +38,7 @@ public class FsCourseWatchCommentController extends BaseController
     /**
      * 查询看课评论列表
      */
-    @PreAuthorize("@ss.hasPermi('course:courseWatchComment:list')")
+
     @GetMapping("/list")
     public R list(FsCourseWatchCommentPageParam fsCourseWatchCommentPageParam)
     {

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

@@ -81,9 +81,9 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping(value = "/{videoId}")
     public AjaxResult getInfo(@PathVariable("videoId") Long videoId)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getUser().getUserId();
-        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,userId));
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getUser().getUserId();
+        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId));
     }
 
     /**

fs-admin/src/main/java/com/fs/task/StoreTask.java

@@ -171,6 +171,14 @@ public class StoreTask
         }
     }
 
+    public void redPacketAddMoney() throws Exception
+    {
+        List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseAddRedPacketLogByCompany();
+        for (RedPacketMoneyVO redPacketMoneyVO : redPacketMoneyVOS) {
+            companyService.addRedPacketCompanyMoney(redPacketMoneyVO.getMoney(),redPacketMoneyVO.getCompanyId());
+        }
+    }
+
     //每5分钟执行一次
     public void deliveryOp()
     {

fs-service-system/src/main/java/com/fs/company/service/ICompanyService.java

@@ -122,4 +122,6 @@ public interface ICompanyService
      * @return
      */
     List<DeptDataVO> getDeptData(Long companyId);
+
+    void addRedPacketCompanyMoney(BigDecimal money, Long companyId);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -492,6 +492,28 @@ public class CompanyServiceImpl implements ICompanyService
             }
         }
     }
+    @Override
+    @Transactional
+    public void addRedPacketCompanyMoney(BigDecimal money, Long companyId) {
+        if(companyId!=null&&companyId>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(companyId);
+            if(company!=null){
+                logger.info("退回红包金额:"+money);
+                company.setMoney(company.getMoney().add(money));
+                companyMapper.updateCompany(company);
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(company.getCompanyId());
+                log.setRemark("退回红包金额");
+                log.setMoney(money);
+                log.setLogsType(16);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                moneyLogsMapper.insertCompanyMoneyLogs(log);
+            }
+        }
+    }
+
+
 
     @Override
     public List<DeptDataVO> getDeptData(Long companyId) {

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

@@ -125,7 +125,7 @@ public interface FsCourseRedPacketLogMapper
             "</script>"})
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVO(@Param("maps")FsCourseRedPacketLogParam fsCourseRedPacketLog);
 
-    @Select("SELECT company_id,sum(amount) as money from fs_course_red_packet_log  WHERE status = 1 and  DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY company_id")
+    @Select("SELECT company_id, SUM(amount) as money  FROM fs_course_red_packet_log    WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY)   AND create_time < CURDATE()  GROUP BY company_id ")
     List<RedPacketMoneyVO> selectFsCourseRedPacketLogByCompany();
     @Select("SELECT company_id,sum(amount) as money from fs_course_red_packet_log  WHERE status = 1 GROUP BY company_id")
     List<RedPacketMoneyVO> selectFsCourseRedPacketLogByCompanyFix();
@@ -160,4 +160,11 @@ public interface FsCourseRedPacketLogMapper
 
     @Select("select * from fs_course_red_packet_log where video_id = #{videoId} and user_id = #{userId} and period_id = #{periodId} limit 1")
     FsCourseRedPacketLog selectUserFsCourseRedPacketLog(@Param("videoId") Long videoId, @Param("userId")Long userId, @Param("periodId")Long periodId);
+
+
+
+    @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();
+
+
 }