From 02d5b44343f3bd9abb667e50ccf469fed9a0a99a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TCouponController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
index 28ac072..c925cd1 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
@@ -104,7 +104,7 @@
TCouponReceive tCouponReceive = new TCouponReceive();
tCouponReceive.setCouponId(dto.getId());
tCouponReceive.setUserId(userId);
- tCouponReceive.setType(2);
+ tCouponReceive.setType(3);
tCouponReceive.setAmount(dto.getAmount());
tCouponReceive.setStoreId(dto.getStoreId());
if (dto.getTime()!=0){
@@ -154,9 +154,18 @@
.eq(TCouponReceive::getCouponId, id)
.eq(TCouponReceive::getStatus, 2)).size();
tCouponInfoVO.setUseCount(size1);
-
+ if (byId.getType()==3){
+ // 查询领取人
+ List<Integer> collect = couponReceiveService.lambdaQuery()
+ .eq(TCouponReceive::getCouponId, id).list()
+ .stream().map(TCouponReceive::getUserId)
+ .distinct()
+ .collect(Collectors.toList());
+ tCouponInfoVO.setUserIds(collect);
+ }
return ApiResult.success(tCouponInfoVO);
}
+
public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
// 将 BufferedImage 转换为字节数组
ByteArrayOutputStream baos = new ByteArrayOutputStream();
--
Gitblit v1.7.1