From 6e39306a7fc83890659f098ed9c6c5f686a6371b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 11:54:08 +0800
Subject: [PATCH] feat(mall): 优化新人礼领取逻辑并添加领取状态字段- 优化新人礼领取逻辑,检查优惠券是否存在且状态为有效 - 在 MallMemberVo 中添加 newGift 字段,用于表示是否领取新人礼

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
index 40d0090..f677265 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
@@ -152,6 +152,15 @@
         if (ObjectUtil.isEmpty(mallActSet)) {
             return new FebsResponse().fail().message("活动不存在,请刷新当前页面");
         }
+        Date date = new Date();
+        int compareStart = DateUtil.compare(date, mallActSet.getActStartTime());
+        if(compareStart < 0){
+            return new FebsResponse().fail().message("活动还未开始");
+        }
+        int compareEnd = DateUtil.compare(date, mallActSet.getActEndTime());
+        if(compareEnd > 0){
+            return new FebsResponse().fail().message("活动已结束");
+        }
         mallActSet.setActStatus(MallActSet.ACT_STATUS_ENABLE);
         this.baseMapper.updateById(mallActSet);
         return new FebsResponse().success();

--
Gitblit v1.9.1