Merge branch 'dev-v5.2' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -158,4 +158,50 @@ public class OrderGoodsVo {
 	@Excel(name = "班级有效期结束时间")
 	@ApiModelProperty("班级有效期结束时间")
 	private Long classEndTime;
+
+	/** 官方账号开通（有接口） */
+	@Excel(name = "官方账号开通（有接口）")
+	@ApiModelProperty("官方账号开通（有接口）")
+	private Integer interfaceAccountId;
+
+	/** 官方信息推送接口 */
+	@Excel(name = "官方信息推送接口")
+	@ApiModelProperty("官方信息推送接口")
+	private Integer interfacePushId;
+
+	/** 描述 */
+	@Excel(name = "描述")
+	@ApiModelProperty("描述")
+	private String introduce;
+
+	/** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+	@Excel(name = "官方学习账号标记状态 0未开通 1已开通 2标记失败")
+	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
+	private Integer learnStatus;
+
+	/** 即刻 1  待定2  日期3 */
+	@Excel(name = "即刻 1  待定2  日期3")
+	@ApiModelProperty("即刻 1  待定2  日期3")
+	private Integer learningStatus;
+
+	/** 开放学习时间 */
+	@Excel(name = "开放学习时间")
+	@ApiModelProperty("开放学习时间")
+	private Long learningTimeStart;
+
+	/** 官方学习地址 */
+	@Excel(name = "官方学习地址")
+	@ApiModelProperty("官方学习地址")
+	private Long officialLearningUrl;
+
+	/** 官方信息推送状态 1是 0否 */
+	@Excel(name = "官方信息推送状态 1是 0否")
+	@ApiModelProperty("官方信息推送状态 1是 0否")
+	private Long officialStatus;
+
+	/** 开班状态 0未开班(预报名) 1开班 */
+	@Excel(name = "开班状态 0未开班(预报名) 1开班")
+	@ApiModelProperty("开班状态 0未开班(预报名) 1开班")
+	private Integer classStatus;
+
 }

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

@@ -71,6 +71,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderStatus" column="order_status"/>
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
+        <result property="interfaceAccountId" column="interface_account_id"/>
+        <result property="interfacePushId" column="interface_push_id"/>
+        <result property="introduce" column="introduce"/>
+        <result property="learningStatus" column="learning_status"/>
+        <result property="learningTimeStart" column="learning_time_start"/>
+        <result property="officialLearningUrl" column="official_learning_url"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="officialStatus" column="official_status"/>
+        <result property="classStatus" column="class_status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -134,7 +143,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cg.class_name,
         o.create_username as create_by,
         cg.class_start_time,
-        cg.class_end_time
+        cg.class_end_time,
+        cg.interface_account_id,
+        cg.interface_push_id,
+        g.introduce,
+        cg.learning_status,
+        cg.learning_time_start,
+        cg.official_learning_url,
+        cgu.learn_status,
+        cgu.official_status,
+        cg.class_status
         FROM
         order_goods og
         LEFT JOIN class_grade cg on og.grade_id = cg.grade_id
@@ -143,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN `order` o ON og.order_sn = o.order_sn
+        LEFT JOIN class_grade_user cgu on cgu.user_id = o.user_id and cgu.grade_id = cg.grade_id
         WHERE
               1=1
         <if test="orderSn != null and orderSn != ''">