fix 订单复购

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -106,4 +106,10 @@ public class CourseUserChapterSectionVo {
 
 	@ApiModelProperty("做卷类型  1练习 2考试")
 	private Long doType;
+
+	@ApiModelProperty("分数")
+	private Long performance;
+
+	@ApiModelProperty("1及格 0不及格")
+	private Integer reportStatus;
 }

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

@@ -146,7 +146,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             userStudyRecordQueryBo.setGoodsId(goods.getGoodsId());
             userStudyRecordQueryBo.setUserId(order.getUserId());
             Long userSeeTime = iUserStudyRecordService.getUserSeeTime(userStudyRecordQueryBo);
-            if(userSeeTime>=(30*60)){ //超30分钟不满足退款
+            if(userSeeTime.longValue()>=(30*60)){ //超30分钟不满足退款
                 throw new CustomException("不满足退款");
             }
         }
@@ -156,7 +156,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             userExamRecordQueryBo.setGoodsId(goods.getGoodsId());
             userExamRecordQueryBo.setUserId(order.getUserId());
             Long doQuestionNum = iUserExamRecordService.getUserDoQuestionNum(userExamRecordQueryBo);
-            if(doQuestionNum>=30){ //超30道题不满足退款
+            if(doQuestionNum.longValue()>=30){ //超30道题不满足退款
                 throw new CustomException("不满足退款");
             }
         }

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

@@ -49,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordingUrl" column="recording_url"/>
         <result property="doType" column="do_type"/>
         <result property="liveUrl" column="live_url"/>
+        <result property="performance" column="performance"/>
+        <result property="reportStatus" column="report_status"/>
     </resultMap>
 
 
@@ -121,14 +123,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             e.exam_name as name,
             e.exam_id as type_id,
             #{gradeId} as grade_id,
-            2 as type
+            2 as type,
+            ubr.report_status,
+            ubr.performance
         FROM
             exam e
                 LEFT JOIN course_menu_exam cme ON cme.exam_id = e.exam_id
+                LEFT JOIN user_bank_record ubr on e.exam_id = ubr.exam_id and  ubr.user_id = #{userId}
+                and ubr.chapter_id = #{userId}
         where 1=1
           and cme.chapter_id = #{chapterId}
-        and cme.course_id = #{courseId}
-        and cme.module_id = #{moduleId}
+          and cme.course_id = #{courseId}
+          and cme.module_id = #{moduleId}
     </select>
 
     <select id="getListTotalTime" parameterType="Long"  resultType="java.lang.Long">

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

@@ -181,8 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             o.user_id = #{userId}
           AND og.goods_id = #{goodsId}
-          AND o.order_status > 0
-
+          AND og.pay_status > 1
     </select>
     <select id="getBuyGoodsReadyPay" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultType="Long">
         SELECT