From 684762fb6caa55ddeb09ec85a79dc6244333eb61 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 31 Jan 2026 13:25:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=82=E5=8A=A0=E4=B8=8D=E4=BA=86?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/act/ActCouponRecordServiceImpl.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 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 cfc35aa5b..44410e8c4 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
@@ -16,11 +16,13 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.constant.act.ActCouponRecordStatusEnum;
 import com.bsd.pjcloud.wallet.api.constant.act.ActUserReceiveEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletTransactionDto;
 import com.bsd.pjcloud.wallet.api.dto.act.ActCouponReceiveDto;
 import com.bsd.pjcloud.wallet.api.dto.act.ActCouponRecordDto;
+import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCouponEntity;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCouponRecordEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
@@ -29,10 +31,7 @@ import com.bsd.pjcloud.wallet.api.vo.transaction.WalletTransactionVo;
 import com.bsd.pjcloud.wallet.mapper.WalletTransactionMapper;
 import com.bsd.pjcloud.wallet.mapper.act.ActCouponMapper;
 import com.bsd.pjcloud.wallet.mapper.act.ActCouponRecordMapper;
-import com.bsd.pjcloud.wallet.service.ActCouponRecordService;
-import com.bsd.pjcloud.wallet.service.ActCouponService;
-import com.bsd.pjcloud.wallet.service.MchManageService;
-import com.bsd.pjcloud.wallet.service.WalletCodeUseService;
+import com.bsd.pjcloud.wallet.service.*;
 import com.bsd.pjcloud.wallet.utils.act.service.ActCouponComUtilService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -53,6 +52,8 @@ import java.util.Map;
 @Service
 public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMapper, ActCouponRecordEntity> implements ActCouponRecordService {
 
+    private static final String TAG = "优惠券活动";
+
     private final ActCouponMapper actCouponMapper;
     private final WalletTransactionMapper walletTransactionMapper;
 
@@ -60,6 +61,7 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
 
     private final ActCouponComUtilService actCouponComUtilService;
     private final ActCouponService actCouponService;
+    private final WalletTypeService walletTypeService;
     private final WalletCodeUseService walletCodeUseService;
 
     private final RemoteUserService remoteUserService;
@@ -156,15 +158,20 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
     }
 
     public ActUserReceiveEnum specialCoupon(ActCouponEntity actCouponEntity, SysUser sysUser) {
+        String uniqueCode = actCouponEntity.getUniqueCode();
         // 食堂生日券
-        if (ObjectUtil.equals(actCouponEntity.getUniqueCode(), "1qRgFo")) {
+        if (ObjectUtil.equals(uniqueCode, "1qRgFo")) {
             // 判断是否为食堂用户
             MchManageVo userMch = mchManageService.getFirstMchByDeptId(sysUser.getDeptId(), List.of(MerchantTypeEnum.CANTEEN));
             if (ObjectUtil.isEmpty(userMch)) {
+                log.info("|{}|{}用户参加{}活动失败:不是食堂用户", TAG, sysUser.getName(), uniqueCode);
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
             // 判断用户最近一年充值是否为500,1500,800,2400
+            WalletTypeEntity walletType = walletTypeService.getByUniqueCode(WalletTypeEnum.EAT);
+
             WalletTransactionDto dto = new WalletTransactionDto();
+            dto.setWalletTypeId(walletType.getId());
             dto.setBizTypes(WalletBizEnum.getTopUpCodes());
             dto.setType(WalletTransactionDto.TYPE_INCOME);
             dto.setUserId(sysUser.getUserId());
@@ -175,6 +182,7 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
             });
             List<WalletTransactionVo> walletList = walletTransactionMapper.scopeList(dto, null);
             if (ObjectUtil.isEmpty(walletList)) {
+                log.info("|{}|{}用户参加{}活动失败:用户最近一年充值金额不足500,1500,800,2400", TAG, sysUser.getName(), uniqueCode);
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
             return ActUserReceiveEnum.USER_CAN_JOIN_ACT;