From eb88e1b9c634496b7840dca48898510f36357d46 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 08:52:11 +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 | 2 +-
1 files changed, 1 insertions(+), 1 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 30c6582..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
@@ -165,7 +165,7 @@
}
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;
}
--
Gitblit v1.7.1