From a1e4cfc3de4f3f3f3956b769bc7af40d097c8a4c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 15:12:57 +0800
Subject: [PATCH] 修改bug
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 27eeb56..d1ddfae 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
@@ -105,7 +105,7 @@
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -114,7 +114,7 @@
continue;
}
couponListVo.setUseCondition("");
- couponListVo.setFavorable(num1 + "元");
+ couponListVo.setFavorable(num1 + "");
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -158,7 +158,7 @@
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -167,7 +167,7 @@
continue;
}
couponListVo.setUseCondition("");
- couponListVo.setFavorable(num1 + "元");
+ couponListVo.setFavorable(num1 + "");
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -218,16 +218,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 +237,7 @@
// 体验券
ruleModel.setConditionalAmount("");
ruleModel.setDeductionAmount("");
- ruleModel.setExperienceName(jsonObject.getString("num1"));
+ ruleModel.setExperienceName(jsonObject.getString("experienceName"));
break;
default:
break;
--
Gitblit v1.7.1