From a75bb5cc48daa9eaf6e40933e96bb0b8ff144ddc Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 12 九月 2024 09:18:55 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 9 +++++---- 1 files changed, 5 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..addc8a2 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()); @@ -128,6 +127,8 @@ record.setDetailsPicture(byId.getDetailsPicture()); } } + PageInfo<ExchangeRecordVO> exchangeRecordVOPageInfo = new PageInfo<>(1, 99999999); + exchangeRecordVOPageInfo.setRecords(data); return AjaxResult.ok(data); } -- Gitblit v1.7.1