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 |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 0ba9902..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,10 +1,15 @@
 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;
+import com.dsh.activity.model.PointMerchandiseIncomeVo;
 import com.dsh.activity.model.request.PointMercharsPayedVo;
 import com.dsh.activity.service.UserPointsMerchandiseService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,4 +26,29 @@
 @Service
 public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {
 
+    @Autowired
+    private UserPointsMerchandiseMapper userPointsMerchandiseMapper;
+
+
+
+
+    @Override
+    public List<PointMerchandiseIncomeVo> 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());
+    }
+
+    @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