From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 0ba9902..ea80b05 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
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -20,5 +22,10 @@
*/
@Service
public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {
-
+ @Autowired
+ private UserPointsMerchandiseMapper userPointsMerchandiseMapper;
+ @Override
+ public List<PointMerchandiseIncomeVo> getAmount() {
+ return userPointsMerchandiseMapper.getAmount();
+ }
}
--
Gitblit v1.7.1