From 21ee583563d59d9d04840f65cb0053df9b183554 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 30 十月 2023 10:08:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 5bf3e1d..ad19807 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 + "元可用");
@@ -113,7 +113,7 @@
if(num1==null){
num1=0d;
}
- if(price.compareTo(num1) <= 0){
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("");
@@ -157,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 + "元可用");
@@ -165,11 +165,11 @@
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
- Double num1 = jsonObject.getDouble("deductionAmount");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
if(num1==null){
num1=0d;
}
- if(price.compareTo(num1) <= 0){
+ if(price.compareTo(num1) < 0){
continue;
}
couponListVo.setUseCondition("");
--
Gitblit v1.7.1