Merge remote-tracking branch 'origin/master'

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

@@ -316,7 +316,7 @@ public class FsUserController extends AppBaseController {
         return fsUserService.becomeMember(param);
     }
 
-    @Login
+    //    @Login
     @PostMapping("/userImage")
     @ApiOperation("生成分享会员海报")
     public R createCourseImage(@RequestBody FsUserCourseBeMemberImageParam param) {

fs-company/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 
 spring:
   profiles:
-    active: dev
+#    active: dev
 #    include: common,config-dev
-#    active: druid-fby
-#    include: common,config-fby
+    active: druid-fby
+    include: common,config-fby

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

@@ -209,7 +209,7 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
             BigDecimal watchNum = new BigDecimal(vo.getWatchNum());
             BigDecimal userNum = new BigDecimal(vo.getUserNum());
             if(!userNum.equals(BigDecimal.ZERO)){
-                BigDecimal onlineRate = watchNum.divide(userNum, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+                BigDecimal onlineRate = watchNum.divide(userNum, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
                 vo.setOnlineRate(onlineRate);
             } else{
                 vo.setOnlineRate(BigDecimal.ZERO);

fs-service-system/src/main/java/com/fs/statis/dto/AnalysisPreviewQueryDTO.java

@@ -6,7 +6,6 @@ import lombok.Setter;
 import java.io.Serializable;
 
 @Data
-@Setter
 public class AnalysisPreviewQueryDTO implements Serializable {
 
     /**

fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsCompanyServiceImpl.java

@@ -1338,7 +1338,74 @@ public class StatisticsCompanyServiceImpl implements IStatisticsCompanyService {
 
     }
 
+    public void rewardMoneyTask15MinutesCompanyUser(){
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUser();
+        for (CompanyUser companyUser : companyUsers) {
+            Long companyId = companyUser.getCompanyId();
+            Long companyUserId = companyUser.getUserId();
+
+            if (companyId == null) {
+                continue;
+            }
+            rewardMoneyTopTenTask(0,0,1,companyId,companyUserId);
+            rewardMoneyTopTenTask(0,1,1,companyId,companyUserId);
+
+            rewardMoneyTradeTask(0,1,companyId,companyUserId);
+
+            rewardMoneyTopTenTask(0,0,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(0,1,2,companyId,companyUserId);
+
+            rewardMoneyTradeTask(0,2,companyId,companyUserId);
+        }
+
+    }
+    public void rewardMoneyTaskEverydayCompanyUser(){
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUser();
+
+        for (CompanyUser companyUser : companyUsers) {
+            Long companyId = companyUser.getCompanyId();
+            Long companyUserId = companyUser.getUserId();
 
+            if (companyId == null) {
+                continue;
+            }
+
+            rewardMoneyTopTenTask(1,0,1,companyId,companyUserId);
+            rewardMoneyTopTenTask(1,1,1,companyId,companyUserId);
+
+
+            rewardMoneyTopTenTask(2,0,1,companyId,companyUserId);
+            rewardMoneyTopTenTask(2,1,1,companyId,companyUserId);
+
+            rewardMoneyTopTenTask(3,0,1,companyId,companyUserId);
+            rewardMoneyTopTenTask(3,1,1,companyId,companyUserId);
+
+            rewardMoneyTopTenTask(4,0,1,companyId,companyUserId);
+            rewardMoneyTopTenTask(4,1,1,companyId,companyUserId);
+
+
+            rewardMoneyTradeTask(1,1,companyId,companyUserId);
+            rewardMoneyTradeTask(2,1,companyId,companyUserId);
+            rewardMoneyTradeTask(3,1,companyId,companyUserId);
+            rewardMoneyTradeTask(4,1,companyId,companyUserId);
+
+
+            rewardMoneyTopTenTask(1,0,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(1,1,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(2,0,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(2,1,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(3,0,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(3,1,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(4,0,2,companyId,companyUserId);
+            rewardMoneyTopTenTask(4,1,2,companyId,companyUserId);
+
+            rewardMoneyTradeTask(1,2,companyId,companyUserId);
+            rewardMoneyTradeTask(2,2,companyId,companyUserId);
+            rewardMoneyTradeTask(3,2,companyId,companyUserId);
+            rewardMoneyTradeTask(4,2,companyId,companyUserId);
+        }
+
+    }
     public void rewardMoneyTaskEveryday(){
         List<OptionsVO> optionsVOS = companyService.selectAllCompanyList();
         for (OptionsVO optionsVO : optionsVOS) {

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserCourseCountServiceImpl.java

@@ -129,7 +129,7 @@ public class FsUserCourseCountServiceImpl implements IFsUserCourseCountService
             if(fsUserCourseCount != null){
                 data.setLastWatchDate(fsUserCourseCount.getLastWatchDate());
                 data.setStatus(fsUserCourseCount.getStatus());
-                data.setStopWatchDays(fsUserCourseCount.getStopWatchDays());
+//                data.setStopWatchDays(fsUserCourseCount.getStopWatchDays());
             }
         }
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -568,8 +568,8 @@ public class FsUserServiceImpl implements IFsUserService
         Map<Long, CompanyTag> tagMap = companyTagCacheService.queryAllTagMap();
         //获取会员的最新的看课状态和最后看课时间
         Set<Long> userIds = fsUserPageListVOS.stream().map(FsUserPageListVO::getUserId).collect(Collectors.toSet());
-        List<FsUserLastCount> fsUserCourseCounts = new ArrayList<>();
-        if (userIds.size() > 0) {
+        List<FsUserLastCount> fsUserCourseCounts = Collections.emptyList();
+        if(!userIds.isEmpty()){
             fsUserCourseCounts = fsUserCourseCountMapper.selectUserLastCount(userIds);
         }
         Map<Long, FsUserLastCount> countMap = fsUserCourseCounts.stream().collect(Collectors.toMap(FsUserLastCount::getUserId, Function.identity()));

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

@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ccut.course_id = fcpd.course_id
             AND ccut.video_id = fcpd.video_id
             AND ccut.company_user_id = #{companyUserId}
-        where course.is_del = 0
+        where course.is_del = 0 and fcp.del_flag = 0 and fcpd.del_flag = 0
         AND FIND_IN_SET(#{companyId}, fcp.company_id)
         <if test="periodId != null and periodId !='' ">
             AND fcpd.period_id = #{periodId}

fs-service-system/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -85,7 +85,7 @@
             <if test="companyId != null">
                 and company_id = #{companyId}
             </if>
-            <if test="companyUseId != null">
+            <if test="companyUserId != null">
                 and company_user_id = #{companyUserId}
             </if>
         </where>

fs-service-system/src/main/resources/mapper/store/FsUserCourseCountMapper.xml

@@ -185,10 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     2
                 WHEN fs_course_watch_log.log_type = 3 THEN
                     3
-                END AS STATUS,
-            DATEDIFF(
-                    DATE_FORMAT( NOW(), '%Y-%m-%d' ),
-                    DATE_FORMAT( fs_course_watch_log.last_heartbeat_time, '%Y-%m-%d' )) AS stop_watch_days
+                END AS STATUS
+--             DATEDIFF(
+--                     DATE_FORMAT( NOW(), '%Y-%m-%d' ),
+--                     DATE_FORMAT( fs_course_watch_log.last_heartbeat_time, '%Y-%m-%d' )) AS stop_watch_days
         FROM
             fs_course_watch_log
         WHERE

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -240,7 +240,7 @@
         SELECT
         b.total_amount,b.last_buy_time,p.pay_money as number,p.payment_id,p.pay_time,
         u.*,
-        fcc.watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
+        fs_course_watch_log.watch_course_count, fs_course_watch_log.part_course_count, company_user.nick_name AS companyUserNickName, fs_course_watch_log.last_watch_date
         ,company.company_name
         FROM
         fs_user u
@@ -260,15 +260,19 @@
         AND b.payment_id = p.payment_id
         LEFT JOIN (
         SELECT
-        fs_user_course_count.user_id,Max( fs_user_course_count.last_watch_date ) AS last_watch_date,fs_user_course_count.watch_course_count,
-        fs_user_course_count.part_course_count
+        fs_course_watch_log.user_id,
+        Max( fs_course_watch_log.last_heartbeat_time ) AS last_watch_date,
+        count( DISTINCT fs_course_watch_log.video_id ) watch_course_count,
+        count( DISTINCT fs_course_watch_log.period_id ) part_course_count
         FROM
-        fs_user_course_count
-        GROUP BY fs_user_course_count.user_id
-        ) fcc ON fcc.user_id = u.user_id
+        fs_course_watch_log
+        GROUP BY
+        fs_course_watch_log.user_id
+        ) fs_course_watch_log ON fs_course_watch_log.user_id = u.user_id
         LEFT JOIN company_user ON company_user.user_id = u.company_user_id
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
+        1 = 1
         <if test = "maps.userId != null" >
             AND u.user_id = #{maps.userId}
         </if >
@@ -549,7 +553,7 @@
         </if>
         <choose>
             <when test = "isBlack">
-                AND (fs_user.status = 0 or fs_user_company_user.is_repeat_fans = 1)
+                AND (fs_user.status = 1 and (fs_user_company_user.is_repeat_fans = 0 or fs_user_company_user.is_repeat_fans is null ))
             </when>
             <otherwise>
                 AND (fs_user.status = 1 and fs_user_company_user.is_repeat_fans = 0)
@@ -644,7 +648,7 @@
             fs_user
                 LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
-        WHERE fs_user.is_del = 0
+        WHERE fs_user.is_del = 0 and fs_user_company_user.is_repeat_fans is not null
         <if test="userId != null and userId != 0 ">
             and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
         </if>

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

@@ -51,6 +51,8 @@ public class CourseWxH5Controller extends AppBaseController {
     @Autowired
     private IFsUserService fsUserService;
 
+
+//    @RepeatSubmit
     @Login
     @ApiOperation("判断是否添加客服（是否关联销售）")
     @PostMapping("/isAddKf")