Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OrderTypeEnum.java

@@ -22,7 +22,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
     TENANT_ALBUM("平台专辑"),
     VIP_COURSE("VIP定制课"),
     DISCOUNT("畅学卡"),
-    GROUP("小组课")
+    GROUP("小组课购买")
     ;
     @EnumValue
     private String code;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -450,6 +450,9 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         imGroup.setName(courseGroup.getName());
         imGroup.setType(ImGroupType.COURSE);
         imGroup.setImg(sysConfigService.findConfigValue(SysConfigConstant.ICON_COURSE_GROUP_DEFAULT));
+        if (courseGroup.getType().equals(CourseScheduleEnum.GROUP.name())) {
+            imGroup.setImg(sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_GROUP));
+        }
         imGroup.setCreateTime(now);
         imGroup.setUpdateTime(now);
 //        String imGroupId = UUID.randomUUID() + imGroup.getType().getCode();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupVo.java

@@ -62,6 +62,9 @@ public class LiveCourseGroupVo {
     @ApiModelProperty(value = "老师姓名")
     private String teacherName;
 
+    @ApiModelProperty(value = "老师编号")
+    private Integer teacherId;
+
     @ApiModelProperty("订单号")
     private String orderNo;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -183,7 +183,8 @@
         cg.im_group_id_  as imGroupId,
         cg.course_plan_ as coursePlan,
         su.username_ as teacherName,
-        su.phone_ as phone
+        su.phone_ as phone,
+        cg.teacher_id_ as teacherId
         from course_group cg
         left join sys_user su on su.id_ = cg. teacher_id_
         <if test="param.studentId != null">