Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -749,6 +749,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         goodsUserVo.setUserProfile(1);
                     }
                 }
+
+                //继续课程显示班级名称
+                if (fullName.contains("继续教育")){
+                    goodsUserVo.setGoodsName(classGradeVo.getClassName());
+                }
             }
 
             goodsUserVo.setGradeId(classGradeVo.getGradeId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigAddBo.java

@@ -36,4 +36,7 @@ public class OrderBusinessConfigAddBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    /** 上传主图 */
+    @ApiModelProperty("上传主图")
+    private String mainImg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigEditBo.java

@@ -39,6 +39,8 @@ public class OrderBusinessConfigEditBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
-
+    /** 上传主图 */
+    @ApiModelProperty("上传主图")
+    private String mainImg;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigQueryBo.java

@@ -35,7 +35,9 @@ public class OrderBusinessConfigQueryBo extends BaseEntity {
 	/** 排序的方向desc或者asc */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
-
+	/** 上传主图 */
+	@ApiModelProperty("上传主图")
+	private String mainImg;
 
 	/** 业务层次id */
 	@ApiModelProperty("业务层次ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBusinessConfig.java

@@ -40,4 +40,6 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 班级类型 1基础班 2强化班 3私塾班 */
     private Integer gradeType;
+    /** 主图上传*/
+    private String mainImg;
 }

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

@@ -594,9 +594,6 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     public List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
         List<OrderGoodsVo> list = this.baseMapper.listUserVideoLive(bo);
         for(OrderGoodsVo goodsVo : list){
-            if(goodsVo.getOrderGoodsId().longValue()==6311L){
-                System.out.println(goodsVo.getOrderGoodsId());
-            }
             String fullName = goodsVo.getEducationName()+goodsVo.getBusinessName()+goodsVo.getProjectName();
             goodsVo.setErJianErZao(false);
             if(Validator.isNotEmpty(fullName)){
@@ -649,6 +646,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 if(Validator.isEmpty(classGradeVo)){
                     continue;
                 }
+                if (fullName.contains("继续教育")){
+                    goodsVo.setGoodsName(classGradeVo.getClassName());
+                }
                 goodsVo.setPeriodStatus(classGradeVo.getPeriodStatus());
                 goodsVo.setPeriodPlush(classGradeVo.getPeriodPlush());
                 goodsVo.setGradeStatus(classGradeVo.getStatus());

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

@@ -49,4 +49,7 @@ public class OrderBusinessConfigVo {
 	/** 班级类型 1基础班 2强化班 3私塾班 */
 	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
 	private Integer gradeType;
+	/** 上传主图 */
+	@ApiModelProperty("上传主图")
+	private String mainImg;
 }

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

@@ -896,6 +896,7 @@
             cg.class_start_time,
             cg.class_end_time,
             cg.class_status,
+            cg.class_name,
             cg.status,
             cg.learning_status,
             cgu.period_status,

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="mainImg" column="main_img"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderBusinessConfigVo" id="OrderBusinessConfigVoResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="mainImg" column="main_img"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">