|
@@ -627,9 +627,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
if (chargeInfo.getDiscountAmount() != null && chargeInfo.getDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
if (chargeInfo.getDiscountAmount() != null && chargeInfo.getDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
amount = amount.subtract(chargeInfo.getDiscountAmount().multiply(new BigDecimal(sporadicPayDto.getNum())));
|
|
amount = amount.subtract(chargeInfo.getDiscountAmount().multiply(new BigDecimal(sporadicPayDto.getNum())));
|
|
}
|
|
}
|
|
- if (!(amount.compareTo(sporadicPayDto.getAmount()) == 0)) {
|
|
|
|
- throw new BizException("订单金额异常");
|
|
|
|
- }
|
|
|
|
if (chargeInfo.getMaxAmount() != null) {
|
|
if (chargeInfo.getMaxAmount() != null) {
|
|
if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount()) <= 0) {
|
|
if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount()) <= 0) {
|
|
throw new Exception("活动名额已满,谢谢您的支持!");
|
|
throw new Exception("活动名额已满,谢谢您的支持!");
|
|
@@ -661,6 +658,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
String channelType = "";
|
|
String channelType = "";
|
|
StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(sporadicPayDto.getCouponIdList(),amount,true);
|
|
StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(sporadicPayDto.getCouponIdList(),amount,true);
|
|
|
|
+ if (!(amount.compareTo(sporadicPayDto.getAmount()) == 0)) {
|
|
|
|
+ throw new BizException("订单金额异常");
|
|
|
|
+ }
|
|
amount = studentPaymentOrder.getActualAmount();
|
|
amount = studentPaymentOrder.getActualAmount();
|
|
studentPaymentOrder.setUserId(userId);
|
|
studentPaymentOrder.setUserId(userId);
|
|
studentPaymentOrder.setGroupType(GroupType.SPORADIC);
|
|
studentPaymentOrder.setGroupType(GroupType.SPORADIC);
|