|
@@ -302,21 +302,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
throw new BizException("订单金额异常");
|
|
|
}
|
|
|
if (chargeInfo.getMaxAmount() != null) {
|
|
|
- if (sporadicPayDto.getIsRepeatPay()) {
|
|
|
- List<StudentPaymentOrder> orders = studentPaymentOrderService.getUserOrderByType(sporadicPayDto.getUserId(), OrderTypeEnum.DOUBLE_ELEVEN2020, DealStatusEnum.ING);
|
|
|
- for (StudentPaymentOrder order : orders) {
|
|
|
- Map<String, String> notifyMap = new HashMap<>();
|
|
|
- notifyMap.put("tradeState", "0");
|
|
|
- notifyMap.put("merOrderNo", order.getOrderNo());
|
|
|
- notifyMap.put("channelType", order.getPaymentBusinessChannel());
|
|
|
- notifyMap.put("orderNo", "");
|
|
|
- notifyMap.put("remarks", "用户主动关闭");
|
|
|
- studentPaymentOrderService.updateOrder(notifyMap);
|
|
|
- }
|
|
|
+ if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount()) <= 0) {
|
|
|
+ throw new Exception("活动人数暂时已满,请稍后再试");
|
|
|
}
|
|
|
-
|
|
|
if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount().add(amount)) < 0) {
|
|
|
- throw new Exception("活动人数暂时已满,请稍后再试");
|
|
|
+ throw new Exception("活动数量暂时已满,请调整数量或稍后再试");
|
|
|
}
|
|
|
}
|
|
|
|