From 2d39bbe3c28b96fe09ba11006620b705d5977d4f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 3 Feb 2026 16:50:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9C=AC=E5=B9=B4=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=EF=BC=8C=E6=9C=AC=E6=9C=88=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/act/ActCouponRecordServiceImpl.java  | 51 ++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCouponRecordServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCouponRecordServiceImpl.java
index 88e40af05..3cbcaaf46 100755
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCouponRecordServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCouponRecordServiceImpl.java
@@ -140,17 +140,24 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
         if (ObjectUtil.isEmpty(record)) {
             throw new ServiceException("优惠券不存在");
         }
-        // 2. 预处理
-        ActCouponRecordEntity actCouponEntity = actCouponComUtilService.preCancel(record);
+        // 2. 查询活动
+        ActCouponEntity actCouponEntity = actCouponService.getById(record.getCouponId());
         if (ObjectUtil.isEmpty(actCouponEntity)) {
+            throw new ServiceException("活动不存在");
+        }
+        // 3. 预处理
+        ActCouponRecordEntity actCouponRecordEntity = actCouponComUtilService.preCancel(record);
+        if (ObjectUtil.isEmpty(actCouponRecordEntity)) {
             throw new ServiceException("优惠券不存在");
         }
-        // 3. 执行核销逻辑
-        actCouponComUtilService.doCancel(actCouponEntity.getId(), orderId, useAmountPrice);
-        // 4. 优惠券核销成功后，执行生命周期方法
-        actCouponComUtilService.afterCancel(actCouponEntity);
-        // 5. 核销短码
-        walletCodeUseService.cancelCode(actCouponEntity.getId());
+        // 4. 特殊核销
+        specialCancelCoupon(actCouponEntity, actCouponRecordEntity, sysUser);
+        // 5. 执行核销逻辑
+        actCouponComUtilService.doCancel(actCouponRecordEntity.getId(), orderId, useAmountPrice);
+        // 6. 优惠券核销成功后，执行生命周期方法
+        actCouponComUtilService.afterCancel(actCouponRecordEntity);
+        // 7. 核销短码
+        walletCodeUseService.cancelCode(actCouponRecordEntity.getId());
     }
 
     /**
@@ -161,6 +168,28 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
         return actCouponComUtilService.actIsCanCancel(detail);
     }
 
+    /**
+     * 特殊核销规则
+     */
+    public void specialCancelCoupon(ActCouponEntity actCouponEntity, ActCouponRecordEntity actCouponRecordEntity, SysUser sysUser) {
+        String uniqueCode = actCouponEntity.getUniqueCode();
+        if (ObjectUtil.equals(uniqueCode, "1qRgFo")) {
+            // 只能本月核销
+            LocalDate birthday = sysUser.getBirthday();
+            if (ObjectUtil.isEmpty(birthday)) {
+                log.info("|{}|{}用户核销{}活动失败:请填写生日", TAG, sysUser.getName(), uniqueCode);
+                throw new ServiceException("请填写生日");
+            }
+            if (ObjectUtil.notEqual(LocalDate.now().getMonth().getValue(), birthday.getMonth().getValue())) {
+                log.info("|{}|{}用户核销{}活动成功:在生日当月核销", TAG, sysUser.getName(), uniqueCode);
+                throw new ServiceException("只能在生日当月核销");
+            }
+        }
+    }
+
+    /**
+     * 特殊领取规则
+     */
     public ActUserReceiveEnum specialCoupon(ActCouponEntity actCouponEntity, SysUser sysUser) {
         String uniqueCode = actCouponEntity.getUniqueCode();
         // 食堂生日券
@@ -193,16 +222,12 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
                 log.info("|{}|{}用户参加{}活动失败:用户最近3个月没有充值{}分", TAG, sysUser.getName(), uniqueCode, walletTotalPrice);
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
-            // 要在生日当月领取
+            // 要在本年领取
             LocalDate birthday = sysUser.getBirthday();
             if (ObjectUtil.isEmpty(birthday)) {
                 log.info("|{}|{}用户参加{}活动失败:请填写生日", TAG, sysUser.getName(), uniqueCode);
                 return ActUserReceiveEnum.PLEASE_FILL_BIRTH_DATE;
             }
-            if (ObjectUtil.notEqual(LocalDate.now().getMonth().getValue(), birthday.getMonth().getValue())) {
-                log.info("|{}|{}用户参加{}活动成功:在生日当月领取", TAG, sysUser.getName(), uniqueCode);
-                return ActUserReceiveEnum.PLEASE_RECEIVE_IN_BIRTH_MONTH;
-            }
             return ActUserReceiveEnum.USER_CAN_JOIN_ACT;
         }
         return null;