From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
index a17e78b..03c44e2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
@@ -25,12 +25,17 @@
*/
@Service
public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {
+
@Autowired
private UserPointsMerchandiseMapper userPointsMerchandiseMapper;
+
+
+
@Override
public List<PointMerchandiseIncomeVo> getAmount() {
- return userPointsMerchandiseMapper.getAmount();
+ List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
+ return amount;
}
@Override
@@ -41,6 +46,9 @@
@Override
public List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo) {
- return this.baseMapper.getConsumeDetails(requestVo);
+ List<ConsumeDetail> consumeDetails = this.baseMapper.getConsumeDetails(requestVo);
+ List<ConsumeDetail> consumeDetails1 = this.baseMapper.getConsumeDetails1(requestVo);
+ consumeDetails.addAll(consumeDetails1);
+ return consumeDetails;
}
}
--
Gitblit v1.7.1