submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionQueryBo.java

@@ -91,4 +91,7 @@ public class QuestionQueryBo extends BaseEntity {
 	/** 导入顺序 */
 	@ApiModelProperty("导入顺序")
 	private Integer importSort;
+	/** 商品服务期校验字段 */
+	@ApiModelProperty("商品服务期校验字段：1，未过期 2，已过期")
+	private Integer serviceCheck;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -193,6 +193,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private String sectionName;
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	@ApiModelProperty("录播和回放的url地址")
+	private String recordingUrl;
 
 
 	@Override

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -531,6 +531,13 @@
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
         </if>
+        <if test="serviceCheck != null and serviceCheck != '' and serviceCheck == 1">
+            AND UNIX_TIMESTAMP(NOW()) &gt;= og.service_start_time
+            AND UNIX_TIMESTAMP(NOW()) &lt;= og.service_end_time
+        </if>
+        <if test="serviceCheck != null and serviceCheck != '' and serviceCheck == 2">
+            AND UNIX_TIMESTAMP(NOW()) &gt; og.service_end_time
+        </if>
         UNION
         SELECT
         g.*,
@@ -572,6 +579,13 @@
         </if>
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
+        </if>
+        <if test="serviceCheck != null and serviceCheck != '' and serviceCheck == 1">
+            AND UNIX_TIMESTAMP(NOW()) &gt;= og.service_start_time
+            AND UNIX_TIMESTAMP(NOW()) &lt;= og.service_end_time
+        </if>
+        <if test="serviceCheck != null and serviceCheck != '' and serviceCheck == 2">
+            AND UNIX_TIMESTAMP(NOW()) &gt; og.service_end_time
         </if>
             )un   ORDER BY un.order_create_time DESC
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -152,6 +152,7 @@
         <result property="liveEndTime" column="live_end_time"/>
         <result property="liveUrl" column="live_url"/>
         <result property="realDuration" column="real_duration"/>
+        <result property="recordingUrl" column="recording_url"/>
         <result property="sectionName" column="section_name"/>
     </resultMap>
 
@@ -1196,6 +1197,7 @@
         NULL as live_end_time,
         NULL as live_url,
         NULL as real_duration,
+        NULL as recording_url,
         NULL as section_name
         FROM
         course_menu cm
@@ -1215,6 +1217,7 @@
         NULL as live_end_time,
         NULL as live_url,
         NULL as real_duration,
+        NULL as recording_url,
         NULL as section_name
         FROM
         course_menu cm
@@ -1233,6 +1236,7 @@
         cs.live_end_time,
         cs.live_url,
         cs.real_duration,
+        cs.recording_url,
         cs.name as section_name
         FROM
         course_menu cm
@@ -1255,6 +1259,7 @@
         cs.live_end_time,
         cs.live_url,
         cs.real_duration,
+        cs.recording_url,
         cs.name as section_name
         FROM
         course_chapter_section ccs