From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 fd6176f..78d3027 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);
/**
* 鏇存柊缁忛攢鍟嗛噾棰�
@@ -154,5 +156,16 @@
IntegralDataResponse getIntegralData(IntegralRecordDTO model);
void updateIntegral(Integral param);
+
+ /**
+ * 绉垎杩囨湡澶勭悊(瀹氭椂浠诲姟)
+ */
+ void expiredIntegral();
+
+
+ /**
+ * 绉垎鍗冲皢杩囨湡閫氱煡
+ */
+ void expiredIntegralNotice();
}
--
Gitblit v1.9.3