|
@@ -1142,14 +1142,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
cloudTeacherOrder.setMusicGroupId(musicGroup.getId());
|
|
|
}
|
|
|
|
|
|
- if (amount.compareTo(orderAmount) != 0) {
|
|
|
- throw new BizException("商品价格不符");
|
|
|
- }
|
|
|
-
|
|
|
- if (amount.compareTo(BigDecimal.ZERO) < 0) {
|
|
|
- throw new BizException("价格异常");
|
|
|
- }
|
|
|
-
|
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
|
|
|
|
String channelType = "";
|
|
@@ -1167,6 +1159,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
registerPayDto.getBuyCloudTeacher(),
|
|
|
registerPayDto.getBuyCloudTeacherPlus(),registerPayDto.getCouponIdList());
|
|
|
studentPaymentOrder = studentPaymentOrderService.get(studentPaymentOrder.getId());
|
|
|
+ amount = studentPaymentOrder.getActualAmount();
|
|
|
+ if (amount.compareTo(orderAmount) != 0) {
|
|
|
+ throw new BizException("商品价格不符");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (amount.compareTo(BigDecimal.ZERO) < 0) {
|
|
|
+ throw new BizException("价格异常");
|
|
|
+ }
|
|
|
boolean canPay = studentPaymentOrder.getClassGroupId() != null && studentPaymentOrder.getClassGroupId().equals(206);
|
|
|
|
|
|
if(cloudTeacherOrder != null){
|