卓美总共后台，营期计算订单金额异常处理、销售端营期查看权限优化

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

@@ -406,7 +406,9 @@ public class FsCourseWatchLogController extends BaseController
         }
         FsCourseSummaryDetailQueryParam param = new FsCourseSummaryDetailQueryParam();
         param.setCompanyId(loginUser.getCompany().getCompanyId());
-        param.setCompanyUserId(loginUser.getUser().getUserId());
+        if(!"00".equals(loginUser.getUser().getUserType())){
+            param.setCompanyUserId(loginUser.getUser().getUserId());
+        }
         param.setVideoId(videoId);
         param.setPeriodId(periodId);
         return R.ok().put("data", fsCourseWatchLogService.getCourseStatisticsDetail(param));
@@ -441,8 +443,10 @@ public class FsCourseWatchLogController extends BaseController
         param.setPeriodId(periodId);
         param.setPageNum(pageNum);
         param.setPageSize(pageSize);
-        param.setCompanyUserId(loginUser.getUser().getUserId());
         param.setCompanyId(loginUser.getCompany().getCompanyId());
+        if(!"00".equals(loginUser.getUser().getUserType())){
+            param.setCompanyUserId(loginUser.getUser().getUserId());
+        }
         PageHelper.startPage(pageNum, pageSize);
         return R.ok().put("data", new PageInfo<>(fsCourseWatchLogService.getCourseStatisticsUserDetailList(param)));
     }
@@ -467,7 +471,9 @@ public class FsCourseWatchLogController extends BaseController
         param.setVideoId(videoId);
         param.setPeriodId(periodId);
         param.setCompanyId(loginUser.getCompany().getCompanyId());
-        param.setCompanyUserId(loginUser.getUser().getUserId());
+        if(!"00".equals(loginUser.getUser().getUserType())){
+            param.setCompanyUserId(loginUser.getUser().getUserId());
+        }
         List<com.fs.course.vo.CourseStatisticsUserDetailVO> list = fsCourseWatchLogService.getCourseStatisticsUserDetailExportList(param);
         ExcelUtil<com.fs.course.vo.CourseStatisticsUserDetailVO> util = new ExcelUtil<>(com.fs.course.vo.CourseStatisticsUserDetailVO.class);
         return util.exportExcel(list, "用户看课数据");

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -279,7 +279,9 @@ public class FsStoreOrderScrmController extends BaseController
         }
 
         FsUser user=userService.selectFsUserById(order.getUserId());
-        user.setPhone(ParseUtils.parsePhone(user.getPhone()));
+        if(user != null && StringUtils.isNotEmpty(user.getPhone())){
+            user.setPhone(ParseUtils.parsePhone(user.getPhone()));
+        }
         FsStoreOrderItemScrm itemMap=new FsStoreOrderItemScrm();
         itemMap.setOrderId(order.getId());
         List<FsStoreOrderItemScrm> items=orderItemService.selectFsStoreOrderItemList(itemMap);

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

@@ -1886,13 +1886,13 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 List<FsStoreOrderItemVO> items = fsStoreOrderItemScrmMapper.selectFsStoreOrderItemListByOrderId(order.getId());
                 if (items == null || items.isEmpty()) continue;
                 long totalNum = order.getTotalNum() != null && order.getTotalNum() > 0 ? order.getTotalNum() : 1;
-                BigDecimal orderPayPrice = order.getPayPrice() != null ? order.getPayPrice() : BigDecimal.ZERO;
+//                BigDecimal orderPayPrice = order.getPayPrice() != null ? order.getPayPrice() : BigDecimal.ZERO;
 
                 for (FsStoreOrderItemVO item : items) {
                     FsStoreCartDTO cartDTO = JSONUtil.toBean(item.getJsonInfo(), FsStoreCartDTO.class);
                     if (item.getProductId() == null) continue;
                     long itemNum = item.getNum() != null ? item.getNum() : 0;
-                    BigDecimal itemAmount = totalNum > 0 ? orderPayPrice.multiply(BigDecimal.valueOf(itemNum)).divide(BigDecimal.valueOf(totalNum), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+                    BigDecimal itemAmount = totalNum > 0 ? cartDTO.getPrice().multiply(BigDecimal.valueOf(itemNum)) : BigDecimal.ZERO;
                     CourseProductSalesVO productSales = productSalesMap.computeIfAbsent(item.getProductId(), k -> {
                         CourseProductSalesVO pvo = new CourseProductSalesVO();
                         pvo.setProductName(cartDTO.getProductName());