fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -441,4 +441,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("商品开通时间")
 	private Long openGoodsTime;
+
+	@ApiModelProperty("旧业务系统订单号")
+	private String oldOrderSn;
 }

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

@@ -220,6 +220,7 @@
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="openGoodsTime" column="open_goods_time"/>
+        <result property="oldOrderSn" column="old_order_sn"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -601,13 +602,15 @@
         IFNULL(ge.exam_num,0) as exam_num,
         og.create_time as open_goods_time,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.`type` in (1,3) and ubr.report_status=1 and ubr.grade_id = og.grade_id and ubr.user_id = o.user_id and ubr.current_status = 1) as record_num,
-        (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) as end_time
+        (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) as end_time,
+        oi.old_order_sn
         FROM
         `order` o
         LEFT JOIN `user` u ON u.user_id = o.user_id
         LEFT JOIN order_goods og ON og.order_sn = o.order_sn
         LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN course_business cb on g.business_id = cb.id
+        LEFT JOIN order_input oi on oi.input_order_sn = o.input_order_sn
         LEFT JOIN (SELECT
         COUNT( m.id ) AS exam_num,
         c.goods_id
@@ -660,7 +663,7 @@
             AND u.telphone = #{telphone,typeHandler=com.zhongzheng.common.type.EncryptHandler}
         </if>
         <if test="oldOrderSn != null and oldOrderSn != ''">
-            AND (select count(*) from order_input oi where oi.old_order_sn = #{oldOrderSn} AND oi.input_order_sn = o.input_order_sn) >0
+            AND oi.old_order_sn = #{oldOrderSn}
         </if>
         <if test="studyFinishStatus != null and studyFinishStatus == 1">
             AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) >0