From d299420aba3a19363755cee0c2b2d8ae93fea928 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:44:30 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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 150a419..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
@@ -1,6 +1,8 @@
package com.dsh.activity.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.BillingDataRequestVo;
+import com.dsh.activity.entity.ConsumeDetail;
import com.dsh.activity.entity.CourseChangeStateDTO;
import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.mapper.UserPointsMerchandiseMapper;
@@ -23,16 +25,30 @@
*/
@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
public Object changeState(CourseChangeStateDTO dto) {
List<Integer> ids = dto.getIds();
- return this.baseMapper.changeState(ids,dto.getState());
+ return this.baseMapper.changeState(ids, dto.getState());
+ }
+
+ @Override
+ public List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo) {
+ List<ConsumeDetail> consumeDetails = this.baseMapper.getConsumeDetails(requestVo);
+ List<ConsumeDetail> consumeDetails1 = this.baseMapper.getConsumeDetails1(requestVo);
+ consumeDetails.addAll(consumeDetails1);
+ return consumeDetails;
}
}
--
Gitblit v1.7.1