From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
index f4dd03b..5986bcf 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
@@ -4,7 +4,9 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Integral;
import com.doumee.dao.web.dto.IntegralDTO;
+import com.doumee.dao.web.dto.IntegralRecordDTO;
import com.doumee.dao.web.request.DealIntegralRequest;
+import com.doumee.dao.web.response.IntegralDataResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -114,6 +116,7 @@
* @return PageData<Integral>
*/
PageData<IntegralDTO> findIntegralDTOPage(PageWrap<IntegralDTO> pageWrap,Integer memberId);
+
/**
* 鏇存柊娑堣垂鑰呯Н鍒�
* @param dealIntegralRequest 瀹炰綋瀵硅薄
@@ -134,4 +137,20 @@
* @return
*/
Integer dealShopAmount(DealIntegralRequest dealIntegralRequest);
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鐨勭Н鍒嗚褰�
+ * @param pageWrap
+ * @return
+ */
+ PageData<Integral> findIntegralRecordPage(PageWrap<IntegralRecordDTO> pageWrap);
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟鎯呭喌绉垎淇℃伅
+ * @param model
+ * @return
+ */
+ IntegralDataResponse getIntegralData(IntegralRecordDTO model);
}
+
--
Gitblit v1.9.3