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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 ad19807..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
@@ -104,12 +104,12 @@
                 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");
+                Double num1 = jsonObject.getDouble("conditionalAmount");
                 if(num1==null){
                     num1=0d;
                 }

--
Gitblit v1.7.1