|
@@ -81,8 +81,8 @@ public class YqPayController extends BaseController {
|
|
|
//1、判断已报名人数
|
|
|
CourseGroupInfo courseGroupInfo = CourseGroupInfoService.get(order.getCourseId());
|
|
|
if (courseGroupInfo.getRegNum().compareTo(courseGroupInfo.getPlanNum()) >= 0) {
|
|
|
- Integer nums = orderService.getPayingOrderNums(order.getGroupId());
|
|
|
- if (nums > 0) {
|
|
|
+ Integer nums = orderService.getPayingOrderNums(order.getCourseId());
|
|
|
+ if (nums != null && nums > 0) {
|
|
|
return failed(HttpStatus.FORBIDDEN, "当前排队人数" + nums + "人,请您耐心等待");
|
|
|
} else {
|
|
|
return succeed("招生人数已满!");
|
|
@@ -497,7 +497,7 @@ public class YqPayController extends BaseController {
|
|
|
Date beforeDate = beforeTime.getTime();
|
|
|
Map<String, Object> rqMap = new HashMap<>();
|
|
|
rqMap.put("orderNoList", orderNoList);
|
|
|
- rqMap.put("beforeDate", beforeDate);
|
|
|
+ rqMap.put("beforeTime", beforeDate);
|
|
|
List<Order> payingOrders = orderService.findPayingOrdersOver(rqMap);
|
|
|
|
|
|
for (Order order : payingOrders) {
|