From face1a695132461b2a2e6b2c47e3dfe495d9b227 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:18:34 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java | 4 ++++
1 files changed, 4 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 76b505b..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,6 +1,8 @@
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;
@@ -22,4 +24,6 @@
List<PointMerchandiseIncomeVo> getAmount();
Object changeState(CourseChangeStateDTO dto);
+
+ List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1