Merge branch 'feature/1113-vipCourse' into develop-new

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

@@ -2914,7 +2914,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             courseVo.setEndTime(courseSchedule.getEndTime());
             courseVo.setStatus(courseSchedule.getStatus());
             courseVo.setCourseGoupId(courseGroup.getId());
-            courseVo.setCourseGroupName(courseGroup.getName());
+            courseVo.setCourseGroupName(courseGroup.getName() + "-第" + courseSchedule.getClassNum() + "课");
             courseVo.setSubjectId(courseGroup.getSubjectId());
             courseVo.setSubjectName(subject.getName());
             if(query.getAttendanceStatus() == null){

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

@@ -50,6 +50,7 @@
         , t.update_time_ as updateTime
         , t.biz_json_ as bizJson
         , t.gift_flag_ as giftFlag
+        , t.discount_json_ as discountJson
         </sql>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo">