From 29880678d26b9fff2b2174c95015b4593d4570e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?=
 <97796069+Cookies-OvO@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:47:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=92=E9=98=9F=E5=88=97=E8=A1=A8:=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E5=B7=B2=E9=A2=86=E5=8F=96=E7=8A=B6=E6=80=81(status?=
 =?UTF-8?q?=3D3)=E6=89=8D=E6=98=BE=E7=A4=BA=E9=A2=86=E5=8F=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=85=B6=E4=BB=96=E7=8A=B6=E6=80=81=E4=BC=A0?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yzt/service/service/impl/StorePinkServiceImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
index 5f0a701..97a7410 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
@@ -217,7 +217,12 @@ public class StorePinkServiceImpl extends ServiceImpl<StorePinkMapper, StorePink
             Integer countPeople = getCountByKidAndCid(pink.getCid(), pink.getId());
             storePinkResponse.setCountPeople(countPeople);
             storePinkResponse.setAddTime(YztDateUtil.timestamp2DateStr(pink.getAddTime()*1000L, Constants.DATE_FORMAT));
-            storePinkResponse.setStopTime(YztDateUtil.timestamp2DateStr(pink.getStopTime()*1000L, Constants.DATE_FORMAT));
+            // 只有已领取状态(status=3)才显示领取时间，其他状态传空
+            if (pink.getStatus() != null && pink.getStatus() == 3) {
+                storePinkResponse.setStopTime(YztDateUtil.timestamp2DateStr(pink.getStopTime()*1000L, Constants.DATE_FORMAT));
+            } else {
+                storePinkResponse.setStopTime(null);
+            }
             StoreCombination combination = storeCombinationService.getById(pink.getCid());
             if(Objects.nonNull(combination)){
                 storePinkResponse.setTitle(combination.getTitle());