From 3c978a0916a4b17ead0d9e6a9f980f4df425f637 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 18 十月 2023 15:25:14 +0800
Subject: [PATCH] update
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index c93933c..6c54b90 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -683,6 +683,9 @@
if(playPaiCoin1!=null || playPaiCoin1>0){
payType=2;
}
+ if((cashPayment!=null || cashPayment>0) &&(playPaiCoin1!=null || playPaiCoin1>0)){
+ payType=3;
+ }
if(cashPayment!=null && cashPayment>0 && playPaiCoin1 !=null && playPaiCoin1>0){
}else {
@@ -698,10 +701,10 @@
paymentPrice = new BigDecimal(students.length).multiply(new BigDecimal(paymentPrice)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
Double playPaiCoin = coursePackagePaymentConfigVo.getPlayPaiCoin().doubleValue();//支付币
playPaiCoin = new BigDecimal(students.length).multiply(new BigDecimal(playPaiCoin)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- if(payType == 1 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0){
+ if(paymentCourseVo.getPayType() != 3 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0){
return ResultUtil.error("支付金额异常，请刷新后重试");
}
- if(payType == 2 && playPaiCoin.compareTo(paymentCourseVo.getPrice()) != 0){
+ if(paymentCourseVo.getPayType() == 3 && playPaiCoin.compareTo(paymentCourseVo.getPrice()) != 0){
return ResultUtil.error("支付金额异常，请刷新后重试");
}
}
--
Gitblit v1.7.1