From 1906d789eb2dfa6246f33ff87e218cdc50be8ca3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 17:02:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 e4e934c..512f879 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
@@ -112,10 +112,9 @@
@PostMapping("/exchangeRecord")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
- public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
- PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
- List<ExchangeRecordVO> records = data.getRecords();
- for (ExchangeRecordVO record : records) {
+ public AjaxResult<List<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
+ List<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
+ for (ExchangeRecordVO record : data) {
TCoupon byId = tCouponService.getById(record.getCouponId());
if (byId!=null){
record.setDiscountAmount("￥"+byId.getDiscountAmount());
--
Gitblit v1.7.1