Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-service/src/main/java/com/fs/course/domain/FsDepVideoShow.java

@@ -0,0 +1,29 @@
+package com.fs.course.domain;
+
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 部门视频疗包展示关联对象 fs_dep_video_show
+ *
+ * @author fs
+ * @date 2025-10-11
+ */
+@Data
+@EqualsAndHashCode()
+public class FsDepVideoShow {
+
+    /** 视频id */
+    private Long videoId;
+
+    /** 是否展示疗包 0展示 1不展示 */
+    @Excel(name = "是否展示疗包 0展示 1不展示")
+    private String isShow;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long depId;
+
+
+}

fs-service/src/main/java/com/fs/course/mapper/FsDepVideoShowMapper.java

@@ -0,0 +1,40 @@
+package com.fs.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.course.domain.FsDepVideoShow;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+/**
+ * 部门视频疗包展示关联Mapper接口
+ * 
+ * @author fs
+ * @date 2025-10-11
+ */
+public interface FsDepVideoShowMapper extends BaseMapper<FsDepVideoShow>{
+    /**
+     * 部门视频疗包展示关联
+     * 
+     * @param videoId, depId  部门视频疗包展示关联主键
+     * @return 部门视频疗包展示关联
+     */
+    @Select("select is_show from fs_dep_video_show where video_id=#{videoId} AND dep_id = #{depId}")
+    String selectFsDepVideoShowByVideoId(@Param("videoId")Long videoId,@Param("depId") Long depId);
+
+    @Select("SELECT is_show FROM fs_dep_video_show WHERE video_id = #{videoId}")
+    String searchAllByVideoIdString(Long videoId);
+    /**
+     * 增加部门视频疗包展示关联
+     *
+     * @param fsDepVideoShow 部门视频疗包展示关联主键
+     * @return 部门视频疗包展示关联
+     */
+    @Insert("INSERT INTO fs_dep_video_show(video_id, is_show, dep_id) VALUES(#{videoId}, #{isShow}, #{depId})")
+    int insertFsDepVideoShowByVideoId(FsDepVideoShow fsDepVideoShow);
+
+    @Update("UPDATE fs_dep_video_show SET is_show = #{isShow} WHERE video_id = #{videoId} AND dep_id = #{depId}")
+    int updateByVideoId(FsDepVideoShow fsDepVideoShow);
+
+}

fs-service/src/main/java/com/fs/course/vo/FsUserCourseVideoH5DVO.java

@@ -1,8 +1,11 @@
 package com.fs.course.vo;
 
 import com.fs.common.core.domain.BaseEntity;
+import com.fs.his.vo.FsPackageListVO;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 课堂视频对象 fs_user_video
  *
@@ -51,4 +54,15 @@ public class FsUserCourseVideoH5DVO extends BaseEntity
 
     private Long listingEndTime;//商品结束售卖时间
 
+
+    /**
+     * 疗法包展示
+     */
+    private String showTreatment;
+
+    /**
+     * 疗法包套餐
+     */
+    private List<FsPackageListVO> treatmentPackage;
+
 }

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -166,4 +166,6 @@ public interface FsPackageMapper
      * 根据套餐包id集合查询列表
      */
     List<FsGoodsVO> getFsGoodsVOListByIds(@Param("packageIds") List<Long> packageIds);
+
+    List<FsPackageListVO> selectFsPackagesByIds(@Param("packageIdList") List<String> packageIds);
 }

fs-service/src/main/resources/mapper/his/FsPackageMapper.xml

@@ -133,6 +133,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="selectFsPackagesByIds" resultType="com.fs.his.vo.FsPackageListVO">
+        select
+        *
+        from fs_package
+        <where>
+            <foreach collection="packageIdList" item="packageId" open="and package_id in (" separator="," close=")">
+                #{packageId}
+            </foreach>
+        </where>
+    </select>
+
     <insert id="insertFsPackage" parameterType="FsPackage" useGeneratedKeys="true" keyProperty="packageId">
         insert into fs_package
         <trim prefix="(" suffix=")" suffixOverrides=",">

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java

@@ -1,8 +1,12 @@
 package com.fs.app.controller.course;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fs.app.annotation.Login;
 import com.fs.app.annotation.UserOperationLog;
 import com.fs.app.controller.AppBaseController;
@@ -10,18 +14,25 @@ import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsCourseQuestionBank;
 import com.fs.course.domain.FsCourseWatchLog;
 import com.fs.course.domain.FsUserCourseVideo;
+import com.fs.course.mapper.FsCourseWatchLogMapper;
+import com.fs.course.mapper.FsDepVideoShowMapper;
+import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.param.*;
 import com.fs.course.service.*;
 import com.fs.course.service.impl.TencentCloudCosService;
 import com.fs.course.vo.*;
 import com.fs.fastGpt.service.IFastgptEventLogTotalService;
 import com.fs.his.enums.FsUserOperationEnum;
+import com.fs.his.mapper.FsPackageMapper;
 import com.fs.his.service.IFsIntegralGoodsService;
+import com.fs.his.vo.FsPackageListVO;
 import com.fs.sop.domain.QwSop;
 import com.fs.sop.service.IQwSopService;
 import com.fs.system.service.ISysConfigService;
@@ -82,6 +93,21 @@ public class CourseQwController extends AppBaseController {
     @Autowired
     private IQwSopService qwSopService;
 
+    @Autowired
+    private CompanyUserMapper companyUserMapper;
+
+    @Autowired
+    private FsCourseWatchLogMapper fsCourseWatchLogMapper;
+
+    @Autowired
+    private FsDepVideoShowMapper fsDepVideoShowMapper;
+
+    @Autowired
+    private FsUserCourseVideoMapper fsUserCourseVideoMapper;
+
+    @Autowired
+    private FsPackageMapper fsPackageMapper;
+
     @ApiOperation("查询全部公域的课程")
     @GetMapping("/getAppletCourse")
     public R getAppletCourse()
@@ -112,13 +138,13 @@ public class CourseQwController extends AppBaseController {
         return R.ok().put("data",course);
     }
 
-    @Login
+//    @Login
     @ApiOperation("h5课程详情加问答")
     @GetMapping("/getH5CourseVideoDetails")
     @UserOperationLog(operationType = FsUserOperationEnum.STUDY)
     public R getCourseVideoDetails(FsUserCourseVideoFinishUParam param)
     {
-        param.setUserId(Long.parseLong(getUserId()));
+//        param.setUserId(Long.parseLong(getUserId()));
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
         FsUserCourseVideoH5DVO course = courseService.selectFsUserCourseVideoH5DVOByVideoId(param.getVideoId());
@@ -171,6 +197,8 @@ public class CourseQwController extends AppBaseController {
                 isFinish=1;
             }
 
+            getGoodsAndShow(param,course);
+
             //将视频时长也存到redis
             String videoRedisKey = "h5user:video:duration:" + param.getVideoId();
             Long videoDuration = redisCache.getCacheObject(videoRedisKey);
@@ -206,11 +234,55 @@ public class CourseQwController extends AppBaseController {
                 isFinish=1;
             }
 
+            getGoodsAndShow(param,course);
+
             return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("isFinish",isFinish);
         }
 
     }
 
+    /**
+     * 小黄车商品和展示
+     */
+    private void getGoodsAndShow(FsUserCourseVideoFinishUParam param, FsUserCourseVideoH5DVO course) {
+        FsCourseWatchLog log = fsCourseWatchLogMapper.getWatchCourseVideo(param.getUserId(),param.getVideoId(),param.getQwUserId(),param.getQwExternalId());
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(log.getCompanyUserId());
+        Long videoId = param.getVideoId();
+        Long deptId = companyUser.getDeptId();
+        String show = fsDepVideoShowMapper.selectFsDepVideoShowByVideoId(videoId, deptId);
+        course.setShowTreatment(ObjectUtil.isEmpty(show) ? "1" : "show");
+
+        FsUserCourseVideo courseVideo = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
+        String packageJson = courseVideo.getPackageJson();
+        if (StringUtils.isNotEmpty(packageJson)) {
+            List<String> packageIds = new ArrayList<>();
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode jsonNode = null;
+            try {
+                jsonNode = objectMapper.readTree(packageJson);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+            if (jsonNode.isArray()) {
+                for (JsonNode node : jsonNode) {
+                    String packageId = node.path("packageId").asText();
+                    if (StringUtils.isNotEmpty(packageId)) {
+                        packageIds.add(packageId);
+                    }
+                }
+                List<FsPackageListVO> fsPackageListVOS = new ArrayList<>();
+                if (!packageIds.isEmpty()) {
+                    fsPackageListVOS = fsPackageMapper.selectFsPackagesByIds(packageIds);
+                }else {
+                    fsPackageListVOS = new ArrayList<>();
+                }
+                course.setTreatmentPackage(fsPackageListVOS);
+            }
+        }else {
+            course.setTreatmentPackage(new ArrayList<>());
+        }
+    }
+
     @ApiOperation("答题")
     @PostMapping("/courseAnswer")
     @Login