From cce4230f0d5643c45cd7d9acae5d725cf28c5d6b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 28 Jan 2026 20:16:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/WalletTransactionMapper.java       |  1 +
 .../impl/act/ActCouponRecordServiceImpl.java  | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java
index a2fe5e7a2..69076ad4c 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java
@@ -37,6 +37,7 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper<WalletTransac
                 .eq(ObjectUtil.isNotEmpty(dto.getDeptId()), WalletTransactionEntity::getDeptId, dto.getDeptId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletTransactionEntity::getUserId, dto.getUserIds())
                 .in(ObjectUtil.isNotEmpty(dto.getBizTypes()), WalletTransactionEntity::getBizType, dto.getBizTypes())
+                .in(ObjectUtil.isNotEmpty(dto.getPriceList()), WalletTransactionEntity::getPrice, dto.getPriceList())
                 .between(
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()),
                         WalletTransactionEntity::getCreateTime,
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 7201a9a70..412a4fd2e 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
@@ -7,11 +7,15 @@ import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.exception.ServiceException;
+import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
 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.entity.act.ActCouponEntity;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCouponRecordEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+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;
@@ -22,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -34,6 +39,7 @@ import java.util.List;
 public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMapper, ActCouponRecordEntity> implements ActCouponRecordService {
 
     private final ActCouponMapper actCouponMapper;
+    private final WalletTransactionMapper walletTransactionMapper;
 
     private final MchManageService mchManageService;
     private final ActCouponComUtilService actCouponComUtilService;
@@ -78,7 +84,19 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
             // 判断用户最近一年充值是否为500,1500,800,2400
-
+            WalletTransactionDto dto = new WalletTransactionDto();
+            dto.setBizTypes(WalletBizEnum.getTopUpCodes());
+            dto.setType(WalletTransactionDto.TYPE_INCOME);
+            dto.setUserId(sysUser.getUserId());
+            dto.setPriceList(List.of(500 * 100, 1500 * 100, 800 * 100, 2400 * 100));
+            dto.setCreateTimeList(new LocalDate[]{
+                    LocalDate.now().minusMonths(6),
+                    LocalDate.now()
+            });
+            List<WalletTransactionVo> walletList = walletTransactionMapper.scopeList(dto, null);
+            if (ObjectUtil.isEmpty(walletList)) {
+                return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
+            }
             return ActUserReceiveEnum.USER_CAN_JOIN_ACT;
         }
         return null;