From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 52028d5..81de709 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
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Integral;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.IntegralDTO;
import com.doumee.dao.web.dto.IntegralRecordDTO;
import com.doumee.dao.web.request.DealIntegralRequest;
@@ -122,14 +124,14 @@
* @param dealIntegralRequest 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer dealIntegral(DealIntegralRequest dealIntegralRequest);
+ Integer dealIntegral(DealIntegralRequest dealIntegralRequest, Member member);
/**
* 鏇存柊缁忛攢鍟嗙Н鍒�
* @param dealIntegralRequest
* @return
*/
- Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest);
+ Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest, Shop shop);
/**
* 鏇存柊缁忛攢鍟嗛噾棰�
@@ -147,7 +149,7 @@
PageData<Integral> findIntegralRecordPage(PageWrap<IntegralRecordDTO> pageWrap);
/**
- * 鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟鎯呭喌绉垎淇℃伅
+ * 鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟娓呯┖绉垎淇℃伅
* @param model
* @return
*/
--
Gitblit v1.9.3