From 0f7e97cd12c2a971d09e3d6ad9d2bad9800f4207 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:20:41 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 53b18ea..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,8 +25,12 @@
*/
@Service
public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {
+
@Autowired
private UserPointsMerchandiseMapper userPointsMerchandiseMapper;
+
+
+
@Override
public List<PointMerchandiseIncomeVo> getAmount() {
@@ -42,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