add:课程log(fs_user_course_period表需要添加字段course_logo)

fs-service-system/src/main/java/com/fs/course/config/CourseConfig.java

@@ -28,6 +28,7 @@ public class CourseConfig implements Serializable {
     private BigDecimal redPackageMoney;//充值手续费百分比
     private List<DisabledTimeVo> disabledTimeList;//充值手续费百分比
     private String companyUserQRCode;// 默认客服二维码图片
+    private String courseLogo;//课程Logo
 
     @Data
     public static class DisabledTimeVo{

fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriod.java

@@ -99,4 +99,6 @@ public class FsUserCoursePeriod
     private List<Long> companyIdList;
 
     private Integer maxViewNum;
+
+    private String courseLogo;
 }

fs-service-system/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -41,7 +41,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
     @Select("select welcome_text,qw_user_name,qw_user_id from qw_user where id = #{id}")
     public QwUser selectQwUserByIdByWeComeText(@Param("id") Long id);
     @Select("select * from qw_user where qw_user_id = #{qwUserId} and corp_id = #{corpId} ")
-    public QwUser selectQwUserByIdByWeComeText(@Param("qwUserId") String qwUserId, @Param("corpId") String corpId);
+    public QwUser selectQwUserByIdByWeComeText2(@Param("qwUserId") String qwUserId, @Param("corpId") String corpId);
     /**
      * 根据companyUserId查询企微用户
      */

fs-service-system/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -381,7 +381,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         if(param.getFilterMode() != null && param.getFilterMode() == 2 && param.getChatIds() != null && param.getChatIds().length > 0){
             List<QwGroupChat> groupList = qwGroupChatMapper.selectQwGroupChatByChatIds(param.getChatIds());
             sopLogsList = groupList.stream().map(groupChat -> {
-                QwUser qwUser = qwUserMapper.selectQwUserByIdByWeComeText(groupChat.getOwner(), groupChat.getCorpId());
+                QwUser qwUser = qwUserMapper.selectQwUserByIdByWeComeText2(groupChat.getOwner(), groupChat.getCorpId());
                 QwSopLogs sopLogs = new QwSopLogs();
 
                 sopLogs.setQwUserid(qwUser.getQwUserId());

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodStartingTime"    column="period_starting_time"    />
         <result property="periodEndTime"    column="period_end_time"    />
         <result property="maxViewNum"    column="max_view_num"    />
+        <result property="courseLogo"    column="course_logo"    />
     </resultMap>
 
     <sql id="selectFsUserCoursePeriodVo">
@@ -103,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="viewEndTime != null">view_end_time,</if>
             <if test="lastJoinTime != null">last_join_time,</if>
             <if test="maxViewNum != null">max_view_num,</if>
+            <if test="courseLogo != null">course_logo,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="periodId != null">#{periodId},</if>
@@ -122,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="viewEndTime != null">#{viewEndTime},</if>
             <if test="lastJoinTime != null">#{lastJoinTime},</if>
             <if test="maxViewNum != null">#{maxViewNum},</if>
+            <if test="courseLogo != null">#{courseLogo},</if>
          </trim>
     </insert>
 
@@ -144,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="viewEndTime != null">view_end_time = #{viewEndTime},</if>
             <if test="lastJoinTime != null">last_join_time = #{lastJoinTime},</if>
             <if test="maxViewNum != null">max_view_num = #{maxViewNum},</if>
+            <if test="courseLogo != null and courseLogo !=''">course_logo = #{courseLogo},</if>
         </trim>
         where period_id = #{periodId}
     </update>

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

@@ -74,6 +74,8 @@ public class CourseController extends  AppBaseController{
     private IFsCourseWatchLogService courseWatchLogService;
     @Autowired
     private CachingOperationNameGenerator cachingOperationNameGenerator;
+    @Autowired
+    private IFsUserCoursePeriodService coursePeriodService;
 
 
     @Cacheable(value="getCourseCate" )
@@ -360,6 +362,13 @@ public class CourseController extends  AppBaseController{
         Long duration = 0L;
         long tipsTime = 0L;
         int isFinish = 0;
+        //课程logo
+        if (param.getPeriodId()!=null){
+            FsUserCoursePeriod fsUserCoursePeriod = coursePeriodService.selectFsUserCoursePeriodById(param.getPeriodId());
+            if (fsUserCoursePeriod!=null){
+                config.setCourseLogo(fsUserCoursePeriod.getCourseLogo());
+            }
+        }
         if (param.getLinkType()!=null&&param.getLinkType()==1){
             return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime);
         }