From 9787739cff0ea639bc7c36c4e086d2952592b414 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 3 Feb 2026 15:47:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/act/ActCancelItemServiceImpl.java  |  9 ++-------
 .../impl/act/ActCouponRecordServiceImpl.java        | 13 +++++++++----
 .../main/resources/mapper/act/ActCancelMapper.xml   |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
index be5cc0dcd..20763c230 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
@@ -231,14 +231,9 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
                 .eq(ActCancelItemEntity::getReceiverUserId, userId)
         );
         if (ObjectUtil.isEmpty(detail)) {
-            return ActUserReceiveEnum.USER_LIMIT_REACHED;
+            return ActUserReceiveEnum.USER_CAN_JOIN_ACT;
         }
-        if (ObjectUtil.isNotEmpty(detail.getExpireTime())) {
-            if (detail.getExpireTime().isBefore(LocalDateTime.now())) {
-                return ActUserReceiveEnum.ACT_EXPIRED;
-            }
-        }
-        return ActUserReceiveEnum.USER_CAN_JOIN_ACT;
+        return ActUserReceiveEnum.USER_LIMIT_REACHED;
     }
 
     /**
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 396da99cd..a04ec8620 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
@@ -25,6 +25,7 @@ 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.WalletManageEntity;
+import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity;
 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;
@@ -166,7 +167,7 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
         if (ObjectUtil.equals(uniqueCode, "1qRgFo")) {
             // 判断是否为食堂用户
             MchManageVo userMch = mchManageService.getFirstMchByDeptId(sysUser.getDeptId(), List.of(MerchantTypeEnum.CANTEEN));
-            if (ObjectUtil.isEmpty(userMch)) {
+            if (ObjectUtil.isEmpty(userMch) && false) {
                 log.info("|{}|{}用户参加{}活动失败:不是食堂用户,用户属于食堂{}", TAG, sysUser.getName(), uniqueCode, JSONUtil.toJsonStr(userMch));
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
@@ -178,14 +179,18 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
             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(4),
+                    LocalDate.now().minusMonths(3).withDayOfMonth(1),
                     LocalDate.now().plusDays(1)
             });
             List<WalletTransactionVo> walletList = walletTransactionMapper.scopeList(dto, null);
             if (ObjectUtil.isEmpty(walletList)) {
-                log.info("|{}|{}用户参加{}活动失败:用户最近一年充值金额不足500,1500,800,2400", TAG, sysUser.getName(), uniqueCode);
+                log.info("|{}|{}用户参加{}活动失败:用户最近3个月没有充值记录", TAG, sysUser.getName(), uniqueCode);
+                return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
+            }
+            Integer walletTotalPrice = walletList.stream().filter(v -> ObjectUtil.isNotEmpty(v.getPrice())).map(WalletTransactionEntity::getPrice).reduce(Integer::sum).orElse(0);
+            if (walletTotalPrice < 1500 * 100) {
+                log.info("|{}|{}用户参加{}活动失败:用户最近3个月没有充值{}分", TAG, sysUser.getName(), uniqueCode, walletTotalPrice);
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
             // 要在生日当月领取
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCancelMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCancelMapper.xml
index 3f124aae0..2a09f51aa 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCancelMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCancelMapper.xml
@@ -48,6 +48,7 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.create_time desc , a.id desc
     </select>
 
 </mapper>
\ No newline at end of file