fix 题库列表

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

@@ -272,4 +272,6 @@ public class GoodsUserQuestionVo {
 	private Long totalExamNum;
 	@ApiModelProperty("用户ID")
 	private Long userId;
+	@ApiModelProperty("科目名称拼接")
+	private String subjectNames;
 }

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

@@ -171,6 +171,7 @@
         <result property="doStartTime" column="do_start_time"/>
         <result property="doEndTime" column="do_end_time"/>
         <result property="doExamNum" column="do_exam_num"/>
+        <result property="subjectNames" column="subject_names"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.bank.bo.QuestionQueryBo" resultMap="QuestionResultVo">
@@ -298,7 +299,8 @@
             og.create_time as order_create_time,
             og.service_start_time,
             og.service_end_time,
-            og.order_goods_id
+            og.order_goods_id,
+           (SELECT GROUP_CONCAT(subject_name)  from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
         FROM
             goods g
                 LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id

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

@@ -460,7 +460,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN mock_major_subject_goods mmsg ON og.goods_id = mmsg.goods_id
         WHERE
             og.refund_status != 2
-			and og.pay_status in (3,4)
+			and og.pay_status in (2,3,4)
 			and og.`status` = 1
 			and mmsg.mock_major_subject_id = #{mockMajorSubjectId}
     </select>