From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java | 12 ++++++++++++
1 files changed, 12 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 ab12b53..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,7 +2,10 @@
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;
import java.util.List;
@@ -18,4 +21,13 @@
*/
public interface UserPointsMerchandiseMapper extends BaseMapper<UserPointsMerchandise> {
+
+ List<PointMerchandiseIncomeVo> getAmount();
+
+
+ Object changeState(List<Integer> ids, Integer state);
+
+ List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
+
+ List<ConsumeDetail> getConsumeDetails1(BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1