he2802 2 年之前
父節點
當前提交
bba5a749c8

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsConfigVo.java

@@ -63,4 +63,9 @@ public class GoodsConfigVo {
 	@ApiModelProperty("班级名称")
 	private String gradeName;
 
+	@ApiModelProperty("官方班级名称")
+	private String officialName;
+
+	@ApiModelProperty("科目名称拼接")
+	private String subjectNames;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -364,4 +364,7 @@ public class GoodsVo {
 	/** 班级类型 1基础班 2强化班 3私塾班 */
 	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
 	private Integer gradeType;
+	@ApiModelProperty("官方班级名称")
+	private String officialName;
+
 }

+ 5 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigGoodsMapper.xml

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lowestPrice" column="lowest_price"/>
         <result property="gradeId" column="grade_id"/>
         <result property="gradeName" column="class_name"/>
+        <result property="officialName" column="official_name"/>
+        <result property="subjectNames" column="subject_names"/>
     </resultMap>
 
     <select id="findGoodsList" resultMap="GoodsResultVo">
@@ -48,7 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.stand_price,
             g.lowest_price,
         (select cg.grade_id from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) grade_id,
-        (select cg.class_name from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) class_name
+        (select cg.class_name from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) class_name,
+        (select cg.official_name from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) official_name,
+         (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
         FROM
              goods g
                  LEFT JOIN major m ON g.major_id = m.id and m.`status` = 1