fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -9,6 +9,7 @@ import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.mock.bo.MockApplyAddBo;
 import com.zhongzheng.modules.mock.bo.MockApplyEditBo;
 import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
@@ -169,9 +170,9 @@ public class MockApplyController extends BaseController {
     @ApiOperation("查询是否有模考讲解直播正在进行")
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/mockLiving")
-    public AjaxResult<String> mockLiving() {
+    public AjaxResult<CourseSectionQueryBo> mockLiving() {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success("", iMockApplyService.mockLiving(loginUser.getUser().getUserId()));
+        return AjaxResult.success(iMockApplyService.mockLiving(loginUser.getUser().getUserId()));
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/mapper/MockApplyMapper.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.mock.mapper;
 
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,7 +31,7 @@ public interface MockApplyMapper extends BaseMapper<MockApply> {
 
     List<MockApplyVo> listSubjects();
 
-    String mockLiving(Long userId);
+    CourseSectionQueryBo mockLiving(Long userId);
 
     List<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/IMockApplyService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.mock.service;
 
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.zhongzheng.modules.mock.domain.MockMajorSubject;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
@@ -68,7 +69,7 @@ public interface IMockApplyService extends IService<MockApply> {
 
     List<MockApplyVo> listSubjects();
 
-    String mockLiving(Long userId);
+	CourseSectionQueryBo mockLiving(Long userId);
 
     List<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.bank.service.IExamService;
+import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.course.domain.CourseHandouts;
 import com.zhongzheng.modules.course.domain.CourseSection;
 import com.zhongzheng.modules.course.domain.Major;
@@ -22,6 +23,7 @@ import com.zhongzheng.modules.mock.bo.*;
 import com.zhongzheng.modules.mock.domain.*;
 import com.zhongzheng.modules.mock.service.*;
 import com.zhongzheng.modules.mock.vo.*;
+import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.user.domain.UserMockSubscribe;
 import com.zhongzheng.modules.user.service.IUserMockSubscribeService;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
@@ -61,6 +63,9 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     @Autowired
     private IGoodsService iGoodsService;
 
+    @Autowired
+    private IOrderService iOrderService;
+
     @Autowired
     private IMajorService iMajorService;
 
@@ -488,6 +493,20 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
 
     @Override
     public List<MockMajorSubjectVo> listMockLive(MockApplyQueryBo bo) {
+        //判断关联商品
+        LambdaQueryWrapper<MockMajorSubjectGoods> lq = Wrappers.lambdaQuery();
+        List<MockMajorSubjectGoods> mockMajorSubjectGoodsList = iMockMajorSubjectGoodsService.list(lq);
+        if (mockMajorSubjectGoodsList != null && mockMajorSubjectGoodsList.size() > 0) {
+            List<Long> goodsIds = iOrderService.getUserGoods(bo.getUserId());
+            List<Long> userGoods = new ArrayList<>();
+            mockMajorSubjectGoodsList.stream().forEach(mockMajorSubjectGoods -> {
+                userGoods.add(mockMajorSubjectGoods.getGoodsId());
+            });
+            List<Long> crossList = goodsIds.stream().filter(userGoods::contains).collect(Collectors.toList());
+            if (crossList.size() == 0) {
+                return new ArrayList<>();
+            }
+        }
         List<MockMajorSubjectVo> list = iMockMajorSubjectService.listMockLive(bo);
         ArrayList<MockMajorSubjectVo> ingList = new ArrayList<>();
         ArrayList<MockMajorSubjectVo> offList = new ArrayList<>();
@@ -529,7 +548,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     }
 
     @Override
-    public String mockLiving(Long userId) {
+    public CourseSectionQueryBo mockLiving(Long userId) {
         return baseMapper.mockLiving(userId);
     }
 

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -55,6 +55,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="coverUrl" column="cover_url"/>
         <result property="mockRemind" column="mockRemind"/>
     </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseSectionVo" id="CourseSectionResultVo">
+        <result property="sectionId" column="section_id"/>
+        <result property="name" column="name"/>
+        <result property="sort" column="sort"/>
+
+        <result property="prefixName" column="prefix_name"/>
+        <result property="status" column="status"/>
+        <result property="sectionType" column="section_type"/>
+        <result property="publishStatus" column="publish_status"/>
+        <result property="liveUrl" column="live_url"/>
+        <result property="liveStartTime" column="live_start_time"/>
+        <result property="liveEndTime" column="live_end_time"/>
+        <result property="recordingUrl" column="recording_url"/>
+        <result property="durationTime" column="duration_time"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="code" column="code"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="sessionId" column="session_id"/>
+        <result property="realLiveStartTime" column="real_live_start_time"/>
+        <result property="realLiveEndTime" column="real_live_end_time"/>
+        <result property="realDuration" column="real_duration"/>
+        <result property="teacherId" column="teacher_id"/>
+        <collection property="businessList" column="section_id" select="findBusinessList"/>
+        <collection property="chapterList" column="section_id" select="findChapterList"/>
+        <!--  <collection property="moduleList" javaType="java.util.List" resultMap="CourseModuleChapterListResult"/>
+          <collection property="courseList" javaType="java.util.List" resultMap="CourseSectionListResult"/> -->
+    </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
                mm.mock_major_id,
@@ -230,9 +259,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             unix_timestamp(now()) &lt; ma.apply_end_time
             AND ma.mock_remind = 0
     </select>
-    <select id="mockLiving" parameterType="java.lang.Long" resultType="java.lang.String">
+    <select id="mockLiving" parameterType="java.lang.Long" resultMap="CourseSectionResultVo">
         SELECT
-            cs.live_url
+            cs.*
         FROM
             user_mock_subscribe ums
         LEFT JOIN mock_major_subject mms ON ums.mock_major_subject_id = mms.mock_major_subject_id