From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +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/mapper/UserPointsMerchandiseMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
index 9353ec6..db8de27 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.activity.entity.BillingDataRequestVo;
+import com.dsh.activity.entity.ConsumeDetail;
import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
import org.apache.ibatis.annotations.Param;
@@ -23,4 +25,9 @@
List<PointMerchandiseIncomeVo> getAmount();
+ Object changeState(List<Integer> ids, Integer state);
+
+ List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
+
+ List<ConsumeDetail> getConsumeDetails1(BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1