fix 课程

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -234,4 +234,10 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("专业名称")
 	private String categoryName;
+
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
+
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvLiveServiceImpl.java

@@ -139,7 +139,6 @@ public class PolyvLiveServiceImpl implements IPolyvLiveService {
         LiveListChannelSessionInfoRequest liveListChannelSessionInfoRequest = new LiveListChannelSessionInfoRequest();
         LiveListChannelSessionInfoResponse liveListChannelSessionInfoResponse;
         try {
-            System.out.println(bo);
             liveListChannelSessionInfoRequest.setChannelId(bo.getChannelId())
                     .setStartDate(new Date((bo.getStartTime()*1000)))
                     .setEndDate(new Date((bo.getEndTime()*1000)))
@@ -149,8 +148,6 @@ public class PolyvLiveServiceImpl implements IPolyvLiveService {
             if (liveListChannelSessionInfoResponse != null) {
                 if(Validator.isNotEmpty(liveListChannelSessionInfoResponse.getContents())&&liveListChannelSessionInfoResponse.getContents().size()>0){
                     //获取该房间最近一次场次
-                    System.out.println("哈哈");
-                    System.out.println(JSON.toJSONString(liveListChannelSessionInfoResponse.getContents().get(0)));
                     LiveListChannelSessionInfoResponse.ChannelSessionInfo sessionInfo = liveListChannelSessionInfoResponse.getContents().get(0);
                     bo.setSessionId(sessionInfo.getSessionId());
                     return getChannelVideo(bo);
@@ -189,7 +186,6 @@ public class PolyvLiveServiceImpl implements IPolyvLiveService {
                 //to do something ......
                 //获取场次的详细信息
                 if(Validator.isNotEmpty(liveChannelVideoListResponse.getChannelVedioInfos())&&liveChannelVideoListResponse.getChannelVedioInfos().size()>0){
-                    System.out.println(JSON.toJSONString(liveChannelVideoListResponse.getChannelVedioInfos().get(0)));
                     return liveChannelVideoListResponse.getChannelVedioInfos().get(0);
                 }
             }
@@ -277,8 +273,6 @@ public class PolyvLiveServiceImpl implements IPolyvLiveService {
             liveGetConsultingRecordResponseList = new LiveChatRoomServiceImpl().getConsultingRecord(liveGetConsultingRecordRequest);
             if (liveGetConsultingRecordResponseList != null) {
                 //to do something ......
-                System.out.println("测试查询咨询提问记录成功{}");
-                System.out.println(JSON.toJSONString(liveGetConsultingRecordResponseList));
             }
         } catch (PloyvSdkException e) {
             //参数校验不合格 或者 请求服务器端500错误，错误信息见PloyvSdkException.getMessage()
@@ -336,7 +330,6 @@ public class PolyvLiveServiceImpl implements IPolyvLiveService {
             if (liveListChannelVideoLibraryResponse != null) {
                 if(Validator.isNotEmpty(liveListChannelVideoLibraryResponse.getContents())){
                     if(liveListChannelVideoLibraryResponse.getContents().size()>0){
-                        System.out.println(JSON.toJSONString(liveListChannelVideoLibraryResponse.getContents()));
                         return liveListChannelVideoLibraryResponse.getContents().get(0);
                     }
                 }

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

@@ -85,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="joinLiveNum" column="join_live_num"/>
         <result property="seeTime" column="see_time"/>
         <result property="categoryName" column="category_name"/>
+        <result property="subjectIds" column="subject_ids"/>
+        <result property="businessId" column="business_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -414,11 +416,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             og.goods_id,
             og.grade_id,
-            og.order_sn
+            og.order_sn,
+            g.business_id,
+            g.subject_ids,
+            cg.class_status,
+            cg.class_start_time,
+            cg.class_end_time
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn
                 LEFT JOIN goods g ON og.goods_id = g.goods_id
+                LEFT JOIN class_grade cg ON og.grade_id = cg.grade_id
         WHERE
             o.user_id = #{userId}
         AND og.`status` =1