From db3e6f6d5a8f29a5dc576aba2eab76a8133ce03c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 08 三月 2024 21:46:10 +0800
Subject: [PATCH] 11.27,9

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 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..53b18ea 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;
@@ -25,14 +27,21 @@
 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) {
+        return this.baseMapper.getConsumeDetails(requestVo);
     }
 }

--
Gitblit v1.7.1