From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 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 ea80b05..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,9 @@
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;
@@ -24,8 +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());
+ }
+
+ @Override
+ public List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo) {
+ return this.baseMapper.getConsumeDetails(requestVo);
}
}
--
Gitblit v1.7.1