From 73be7ff2317fea8194b7a6dc0452b64a511c7836 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 18:42:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index 9a00b7d..f666844 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -118,7 +118,12 @@
for (ExchangeRecordVO record : data) {
TCoupon byId = tCouponService.getById(record.getCouponId());
if (byId!=null){
+ if (byId.getDiscountAmount()!=null){
record.setDiscountAmount("￥"+byId.getDiscountAmount());
+
+ }else{
+ record.setDiscountAmount("￥"+byId.getMaximumDiscountAmount());
+ }
if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){
record.setMeetTheConditions("无门槛");
}else{
--
Gitblit v1.7.1