Merge remote-tracking branch 'origin/master'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -431,7 +431,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());
             criteria.andStatusIn(collect);
         }
-        orderExample.setOrderByClause("create_time desc");
+        orderExample.setOrderByClause(" field(status,'0','6','1','2','3','4','5'),create_time desc");
         List<OmsOrder> orderList = orderMapper.selectByExample(orderExample);
         CommonPage<OmsOrder> orderPage = CommonPage.restPage(orderList);
         //设置分页信息
@@ -846,7 +846,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         Long increment = redisService.incr(key, 1);
         sb.append(date);
         sb.append(String.format("%02d", order.getSourceType()));
-        sb.append(String.format("%02d", order.getPayType()));
+        // sb.append(String.format("%02d", order.getPayType()));
         String incrementStr = increment.toString();
         if (incrementStr.length() <= 6) {
             sb.append(String.format("%06d", increment));

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

@@ -1113,7 +1113,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         Date endTime = adjustVo.getEndTime();
         Date now = new Date();
         //校验时间是否为未来时刻
-        if (classDate.before(now) || startTime.before(now) || endTime.before(now)) {
+        if (startTime.before(now) || endTime.before(now)) {
             throw new BizException("排课日期必须大于当前日期");
         }
         if (!(DateUtil.dateToString(classDate).equals(DateUtil.dateToString(startTime))) ||
@@ -2031,7 +2031,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         courseTime.setEndTime(courseSchedule.getEndTime());
         List<CourseTimeEntity> timeList = Arrays.asList(courseTime);
         //批量检查老师课时在数据库是否重复
-        this.batchCheckTeacherCourseTime(teacherId, timeList, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime);
+//        this.batchCheckTeacherCourseTime(teacherId, timeList, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime);
 
         List<CourseScheduleStudentPayment> payments = new ArrayList<>();
         for (Long studentId : studentIds) {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -277,6 +277,7 @@ public class TeacherCourseScheduleController extends BaseController {
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "studentIds", dataType = "List", value = "学生id集合"),
+            @ApiImplicitParam(name = "courseId", dataType = "Long", value = "课程id"),
     })
     @ApiOperation("调整上课学员")
     @PostMapping("/updateCourseStudent")