From 336cc1da02624db3d42ad09187b6b51b98ee35dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:20:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
index 81e58a7..ab0122f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
@@ -1,7 +1,11 @@
 package com.dsh.activity.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+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.model.PointMerchandiseIncomeVo;
 import com.dsh.activity.model.request.PointMercharsPayedVo;
 
 import java.util.List;
@@ -17,4 +21,9 @@
  */
 public interface UserPointsMerchandiseService extends IService<UserPointsMerchandise> {
 
+    List<PointMerchandiseIncomeVo> getAmount();
+
+    Object changeState(CourseChangeStateDTO dto);
+
+    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
 }

--
Gitblit v1.7.1