From b2573583e7c70827fa90111ff1d769f79603edd0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 14:57:05 +0800
Subject: [PATCH] 10.27.2
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 d1ddfae..30c6582 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,7 +101,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 + "元可用");
@@ -110,7 +110,10 @@
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("deductionAmount");
- if(price.compareTo(num1) <= 0){
+ 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 + "元可用");
@@ -163,7 +166,10 @@
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("deductionAmount");
- if(price.compareTo(num1) <= 0){
+ if(num1==null){
+ num1=0d;
+ }
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("");
--
Gitblit v1.7.1