Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

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

@@ -120,6 +120,8 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/qwWatchLogAllStatisticsList")
     public TableDataInfo qwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
+        logger.info("会员课程数据汇总 参数: {}",param);
+
         if(param.getCompanyId() == null){
             throw new CustomException("必须选择公司！");
         }

fs-admin/src/main/java/com/fs/course/controller/qw/QwFsCourseWatchLogController.java

@@ -109,6 +109,7 @@ public class QwFsCourseWatchLogController extends BaseController
     @GetMapping("/qwWatchLogAllStatisticsList")
     public TableDataInfo qwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
+        logger.info("企微课程数据汇总 参数:{}",param);
         startPage();
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());

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

@@ -9,6 +9,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +17,10 @@ import java.util.concurrent.TimeUnit;
 
 @Service
 @Slf4j
-@RequiredArgsConstructor
 public class CompanyUserCacheServiceImpl implements ICompanyUserCacheService {
 
-    private final ICompanyUserService companyUserService;
+    @Autowired
+    private ICompanyUserService companyUserService;
 
     private static final Cache<Long, CompanyUser> USER_CACHE = Caffeine.newBuilder()
             .maximumSize(1000)

fs-service-system/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -311,9 +311,11 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
             }
             // 销售名称
             CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(item.getCompanyUserId());
+            if(companyUser != null) {
+                item.setQwUserName(companyUser.getUserName());
+                item.setCreateTime(companyUser.getCreateTime());
+            }
 
-            item.setQwUserName(companyUser.getUserName());
-            item.setCreateTime(companyUser.getCreateTime());
             list.add(item);
         }
 

fs-user-app/src/main/java/com/fs/app/controller/CourseWxH5Controller.java

@@ -93,6 +93,7 @@ public class CourseWxH5Controller extends AppBaseController {
     @PostMapping("/updateWatchDuration")
     public R updateWatchDuration(@RequestBody FsUserCourseVideoUParam param)
     {
+        param.setUserId(Long.parseLong(getUserId()));
         return courseVideoService.updateWatchDurationWx(param);
     }
 
@@ -100,6 +101,7 @@ public class CourseWxH5Controller extends AppBaseController {
     @ApiOperation("获取缓冲流量")
     @PostMapping("/getInternetTraffic")
     public R getInternetTraffic(@RequestBody FsUserCourseVideoFinishUParam param) {
+        param.setUserId(Long.parseLong(getUserId()));
         return courseVideoService.getInternetTraffic(param);
     }
 
@@ -120,6 +122,7 @@ public class CourseWxH5Controller extends AppBaseController {
     @RepeatSubmit
     public R sendReward(@RequestBody FsCourseSendRewardUParam param)
     {
+        param.setUserId(Long.parseLong(getUserId()));
         logger.info("zyp \n【发放奖励】：{}",param);
         return courseVideoService.sendRewardByFsUser(param);
     }