From 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 05 八月 2025 09:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
index 3fb6dae..a6d4674 100644
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
@@ -43,6 +43,7 @@
@RequestMapping("/buyer/promotion/coupon")
public class CouponBuyerController {
+
/**
* 浼樻儬鍒�
*/
@@ -85,15 +86,23 @@
@GetMapping
@ApiOperation(value = "鑾峰彇鍙鍙栦紭鎯犲埜鍒楄〃")
public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
+ System.out.println("------------------------------------");
+ System.out.println(queryParam);
queryParam.setPromotionStatus(PromotionsStatusEnum.START.name());
queryParam.setGetType(CouponGetEnum.FREE.name());
IPage<CouponVO> canUseCoupons = couponService.pageVOFindAll(queryParam, page);
+
+ List<CouponVO> list = canUseCoupons.getRecords();
+ couponService.getUserCouponsStatus(list);
+ //鏇村叿鐢ㄦ埛id
return ResultUtil.data(canUseCoupons);
}
@ApiOperation(value = "鑾峰彇褰撳墠浼氬憳鐨勪紭鎯犲埜鍒楄〃")
@GetMapping("/getCoupons")
public ResultMessage<IPage<MemberCoupon>> getCoupons(MemberCouponSearchParams param, PageVO pageVo) {
+ System.out.println("------------------------------------");
+ System.out.println(param);
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
param.setMemberId(currentUser.getId());
return ResultUtil.data(memberCouponService.getMemberCoupons(param, pageVo));
--
Gitblit v1.8.0