From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 43d329d..7358a5e 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
@@ -144,7 +144,7 @@
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
- Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("num1");
+ Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
if(vipPrice.compareTo(num1) > 0){
vipPrice = num1;
}
@@ -233,7 +233,7 @@
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
- Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("num1");
+ Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
if(vipPrice.compareTo(num1) > 0){
vipPrice = num1;
}
@@ -313,7 +313,7 @@
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
- Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("num1");
+ Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
if(vipPrice.compareTo(num1) > 0){
vipPrice = num1;
}
@@ -402,7 +402,7 @@
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
- Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("num1");
+ Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
if(vipPrice.compareTo(num1) > 0){
vipPrice = num1;
}
@@ -480,8 +480,9 @@
}
if(coupon.getType() == 1){//满减
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
- Double num2 = jsonObject.getDouble("num2");
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ Double num2 = jsonObject.getDouble("deductionAmount");
if(price.compareTo(num1) <= 0){
return ResultUtil.error("该优惠券无法使用");
}
@@ -490,7 +491,7 @@
}
if(coupon.getType() == 2){//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
if(price.compareTo(num1) <= 0){
return ResultUtil.error("该优惠券无法使用");
}
--
Gitblit v1.7.1