fix 课程列表

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -214,6 +214,19 @@ public class GoodsController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询商品列表
+     */
+    @ApiOperation("查询用户拥有视频+直播商品")
+    @GetMapping("/listUserVideoLive")
+    public TableDataInfo<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<OrderGoodsVo> list = iOrderGoodsService.listUserVideoLive(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 获取商品详细信息
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -104,4 +104,8 @@ public class CourseQueryBo extends BaseEntity {
 
 	@ApiModelProperty("科目id多个")
 	private List<Long> subjectIds;
+
+	/** 订单商品Id */
+	@ApiModelProperty("订单商品Id")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -519,12 +519,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(Validator.isNotEmpty(classGradeVo)){
             goodsVo.setGradeId(classGradeVo.getGradeId());
         }
-        if(goodsVo.getGoodsType()==1){
-            GoodsVo goodsSectionVo = baseMapper.getSectionNum(bo);
-            goodsVo.setSecAllNum(goodsSectionVo.getSectionNum());
-            goodsVo.setCourseNum(goodsSectionVo.getCourseNum());
-            goodsVo.setExamNum(goodsSectionVo.getExamNum());
-        }
         return goodsVo;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -46,4 +46,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVo> selectBuyUserList(Long mockMajorSubjectId);
 
     List<Long> getCourseIdByLive(Long userId);
+
+    List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -101,4 +101,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
      * @return com.zhongzheng.common.core.page.TableDataInfo<com.zhongzheng.modules.course.vo.CourseLiveVo>
      */
     TableDataInfo<CourseLiveVo> getLiveList(PageDomain pageDomain,Long userId);
+
+    List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -558,6 +558,13 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return info;
     }
 
+    @Override
+    public List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
+        List<OrderGoodsVo> list = this.baseMapper.listUserVideoLive(bo);
+
+        return list;
+    }
+
     public boolean joinGrade(Long orderGoodsId, Long gradeId, Long userId, Long goodsId) {
         ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
         if (classGradeVo == null) {

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -563,6 +563,9 @@
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != ''">
+            AND og.order_goods_id = #{orderGoodsId}
+        </if>
         order by o.create_time desc
     </select>
     <select id="courseList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultMap="CourseUserVo">

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -418,6 +418,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY og.create_time DESC
     </select>
 
+    <select id="listUserVideoLive" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="OrderGoodsResultVo">
+        SELECT
+        g.*,
+        cet.education_name,
+        cpt.project_name,
+        cb.business_name,
+        o.user_id,
+        og.create_time as order_create_time,
+        og.service_start_time,
+        og.service_end_time,
+        og.order_goods_id,
+        og.grade_id
+        FROM
+        order_goods og
+        LEFT JOIN goods g on g.goods_id =og.goods_id
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN `order` o on o.order_sn = og.order_sn
+        WHERE
+        1 = 1
+        AND g.goods_type in (1,6)
+        AND o.user_id=#{userId}
+        AND og.`status` =1
+        and og.pay_status in (2,3,4)
+        AND og.refund_status in (0,3,1)
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        ORDER BY og.create_time DESC
+    </select>
+
 
     <select id="listUserSubjectGoods" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="OrderGoodsResultVo">
         SELECT