查询待支付订单

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

@@ -1551,7 +1551,15 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             
             homePage.setLiveList(baseMapper.selectLive(appAuditVersion, subjectId));
             homePage.setVideoList(baseMapper.selectVideo(appAuditVersion, subjectId));
-            homePage.setRecentCourses(baseMapper.selectRecentCourses(studentId));
+            StudentHomePage.RecentCourses recentCourses = baseMapper.selectRecentCourses(studentId);
+
+            if (CourseScheduleEnum.PRACTICE.getCode().equals(recentCourses.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(recentCourses.getCourseType())) {
+                SysUser sysUser = sysUserService.getByUserId(recentCourses.getTeacherId());
+                if (sysUser != null) {
+                    recentCourses.setCourseGroupName(recentCourses.getCourseGroupName() + "-" + sysUser.getUsername());
+                }
+            }
+            homePage.setRecentCourses(recentCourses);
         }
         if (studentId == null) {
             //vip课和趣纠课
@@ -1576,7 +1584,17 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             }
 
             // 本周未上课程数
-            coursesPractice.setNotStartCount(getWeekNotStart(teacherId));
+            if (coursesPractice != null) {
+
+                if (CourseScheduleEnum.PRACTICE.getCode().equals(coursesPractice.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(coursesPractice.getCourseType())) {
+                    SysUser sysUser = sysUserService.getByUserId(coursesPractice.getStudentId());
+                    if (sysUser != null) {
+                        coursesPractice.setCourseGroupName(coursesPractice.getCourseGroupName() + "-" + sysUser.getUsername());
+                    }
+                }
+
+                coursesPractice.setNotStartCount(getWeekNotStart(teacherId));
+            }
         }
         return homePage;
     }

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

@@ -698,7 +698,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             // 没有畅学卡 ，循环商品检查是否有畅学卡
             if (!discountFlag) {
                 for (UserPaymentOrderWrapper.OrderGoodsInfo item : orderReq.getGoodsInfos()) {
-                    if (item.getGoodType() == GoodTypeEnum.DISCOUNT) {
+                    if (item.getGoodType() == GoodTypeEnum.DISCOUNT && Boolean.FALSE.equals(item.getGiftFlag())) {
                         discountFlag = true;
                         break;
                     }

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

@@ -47,6 +47,8 @@ public class StudentHomePage implements Serializable {
         private String status;
         @ApiModelProperty(value = "开课时间")
         private Date courseStartTime;
+        @ApiModelProperty(value = "结束时间")
+        private Date courseEndTime;
 
         @ApiModelProperty(value = "本周未上课程数")
         private Integer notStartCount;

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

@@ -665,13 +665,14 @@
             g.name_ AS courseGroupName,
             p.course_type_ AS courseType,
             s.status_ AS `status`,
-            s.start_time_ AS courseStartTime
+            s.start_time_ AS courseStartTime,
+            s.end_time_ AS courseEndTime
         FROM course_schedule_student_payment p
         LEFT JOIN course_schedule s ON p.course_id_=s.id_
         LEFT JOIN sys_user u ON s.teacher_id_=u.id_
         LEFT JOIN course_group g ON p.course_group_id_=g.id_
         WHERE p.user_id_=#{studentId}
-        AND s.status_ = 'ING'
+        AND s.status_ IN ('ING','NOT_START') and g.status_='ING'
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>