From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
index 180dee1..82cbb63 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
@@ -6,6 +6,8 @@
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.dto.MemberCouponDTO;
+import com.doumee.dao.web.request.PayDetailRequest;
+import com.doumee.dao.web.response.MemberCouponResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -98,7 +100,7 @@
* @param memberCoupon 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(MemberCoupon memberCoupon);
+ long count(MemberCoupon memberCoupon);
/****************************************绉诲姩绔帴鍙ｅ紑濮�********************************************************************/
@@ -110,9 +112,14 @@
* @param couponType
* @return
*/
- IPage<CouponDTO> memberCouponPage(IPage pages, BigDecimal price, Integer memberId, Integer couponType);
+ IPage<MemberCouponResponse> memberCouponPage(IPage pages, BigDecimal price, Integer memberId, Integer couponType, Integer status);
-
+ /**
+ * 浼氬憳浼樻儬鍒歌鎯�
+ * @param id
+ * @return
+ */
+ MemberCouponResponse getMemberCouponDetail(Integer id);
/**
* 鍙敤浼樻儬鍒告暟閲�
* @param price
@@ -120,7 +127,7 @@
* @param couponType
* @return
*/
- Integer memberCouponNum(BigDecimal price, Integer memberId, Integer couponType);
+ long memberCouponNum(BigDecimal price, Integer memberId, Integer couponType);
/**
*
@@ -130,4 +137,12 @@
*/
PageData<MemberCouponDTO> findMemberCouponDTO(PageWrap<MemberCouponDTO> pageWrap);
+ /**
+ * 鏍规嵁鍟嗗搧閫夋嫨淇℃伅 鏌ヨ瀵瑰簲鍙娇鐢ㄧ殑浼樻儬鍒�
+ * @param requestList
+ * @param memberId
+ * @return
+ */
+ List<MemberCoupon> getApplyCoupon(List<PayDetailRequest> requestList, Integer memberId);
+
}
--
Gitblit v1.9.3