add

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -29,6 +29,7 @@ import com.fs.company.vo.RedPacketMoneyVO;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.course.service.IFsCourseWatchLogService;
+import com.fs.course.service.ITencentCloudCosService;
 import com.fs.crm.param.SmsSendParam;
 import com.fs.erp.domain.ErpDeliverys;
 import com.fs.erp.domain.ErpOrderQuery;
@@ -210,13 +211,19 @@ public class Task {
     @Autowired
     private IFsCourseWatchLogService fsCourseWatchLogService;
 
-    public void tt() throws Exception
+    @Autowired
+    ITencentCloudCosService tencentCloudCosService;
+    public void videoTranscode() throws Exception
     {
 
-
+        tencentCloudCosService.videoTranscode();
     }
 
+    public void updateUrl() throws Exception
+    {
 
+        tencentCloudCosService.updateUrl();
+    }
     public void addPrescribeImg() throws Exception
     {
        List<Long> ids= fsPrescribeService.selectFsPrescribeByPrescribeIdByOrderType();

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

@@ -161,7 +161,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         FsUserCourseVideo courseVideo = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
 
         BeanCopyUtils.copy(courseVideo,fsUserCourseVideoQVO);
-
+        if (courseVideo.getRedPacketMoney()!=null){
+            fsUserCourseVideoQVO.setRedPacketMoney(courseVideo.getRedPacketMoney().toString());
+        }
         if (StringUtils.isNotEmpty(courseVideo.getQuestionBankId())){
             List<FsCourseQuestionBank> fsCourseQuestionBanks = courseQuestionBankMapper.selectFsCourseQuestionBankByIdVO(courseVideo.getQuestionBankId().split(","));
             fsUserCourseVideoQVO.setQuestionBankList(fsCourseQuestionBanks);
@@ -656,14 +658,17 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if (param.getLinkType() != null && param.getLinkType() == 1) {
             FsCourseRedPacketLog packetLog = redPacketLogMapper.selectFsCourseRedPacketLogByTemporary(param.getVideoId(), param.getUserId());
             if (packetLog != null) {
+                System.out.println("奖励已发放1");
                 return R.error("奖励已发放");
             }
         } else {
             log = courseWatchLogMapper.getWatchCourseVideo(param.getUserId(), param.getVideoId(), param.getQwUserId(), param.getQwExternalId());
             if (log == null) {
+                System.out.println("无记录");
                 return R.error("无记录");
             }
             if (log.getRewardType() != null) {
+                System.out.println("奖励已发放2");
                 return R.error("奖励已发放");
             }
         }

fs-service/src/main/java/com/fs/qw/mapper/QwTagMapper.java

@@ -89,7 +89,7 @@ public interface QwTagMapper
             "#{tagId}" +
             "</foreach>" +
             "</script>")
-    List<String> selectQwTagListByTagIds(@Param("date") QwTagSearchParam param);
+    List<String> selectQwTagListNameByTagIds(@Param("date") QwTagSearchParam param);
 
     List<QwTag> selectQwTagListByTagIds(@Param("tagIds") List<String> tagIds);
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwTagServiceImpl.java

@@ -193,6 +193,6 @@ public class QwTagServiceImpl implements IQwTagService
 
     @Override
     public List<String> selectQwTagListByTagIds(QwTagSearchParam param) {
-        return qwTagMapper.selectQwTagListByTagIds(param);
+        return qwTagMapper.selectQwTagListNameByTagIds(param);
     }
 }