From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 302737d..b66d838 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -101,16 +101,19 @@
if (type == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("conditionalAmount");
- if(price.compareTo(num1) <= 0){
+ if(price.compareTo(num1) < 0){
continue;
}
- couponListVo.setUseCondition("满" + num1 + "元可用");
+ couponListVo.setUseCondition("满￥" + num1 + "元可用");
couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
- Double num1 = jsonObject.getDouble("deductionAmount");
- if(price.compareTo(num1) <= 0){
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ if(num1==null){
+ num1=0d;
+ }
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("");
@@ -154,7 +157,7 @@
if (type == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("conditionalAmount");
- if(price.compareTo(num1) <= 0){
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -162,8 +165,11 @@
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
- Double num1 = jsonObject.getDouble("deductionAmount");
- if(price.compareTo(num1) <= 0){
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ if(num1==null){
+ num1=0d;
+ }
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("");
@@ -218,16 +224,17 @@
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
switch (coupon.getType()) {
case 1:
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
// 满减券
- Double num1 = jsonObject.getDouble("num1");
- Double num2 = jsonObject.getDouble("num2");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ Double num2 = jsonObject.getDouble("deductionAmount");
ruleModel.setConditionalAmount("满"+num1+"可用");
ruleModel.setDeductionAmount("¥ "+num2);
ruleModel.setExperienceName("");
break;
case 2:
// 代金券
- Double jsonObjectDouble = jsonObject.getDouble("num1");
+ Double jsonObjectDouble = jsonObject.getDouble("conditionalAmount");
ruleModel.setConditionalAmount("");
ruleModel.setDeductionAmount("¥ "+jsonObjectDouble);
ruleModel.setExperienceName("");
@@ -236,7 +243,7 @@
// 体验券
ruleModel.setConditionalAmount("");
ruleModel.setDeductionAmount("");
- ruleModel.setExperienceName(jsonObject.getString("num1"));
+ ruleModel.setExperienceName(jsonObject.getString("experienceName"));
break;
default:
break;
--
Gitblit v1.7.1