From 768267fd2132f0bdb87950d47d14287a5eb28257 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 10:39:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E6=83=A0=E5=88=B8=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java | 3 ++- .../wallet/controller/act/ActCancelItemController.java | 6 +++++- .../wallet/controller/act/ActCouponRecordController.java | 6 +++++- .../wallet/service/impl/act/ActCancelItemServiceImpl.java | 6 +++++- .../wallet/service/impl/act/ActCouponRecordServiceImpl.java | 6 +++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java index 982e9aca5..ec115f598 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java @@ -16,7 +16,8 @@ public enum ActUserReceiveEnum { ACT_EXPIRED("1", "活动不在进行中"), ACT_NOT_EXIST("2", "活动不存在"), ACT_NOT_STARTED("3", "活动未开启"), - USER_LIMIT_REACHED("4", "用户参加活动已达上限"), + // 用户参加活动已达上限 + USER_LIMIT_REACHED("4", "已领取,核销码在我的礼券中"), USER_CANNOT_PARTICIPATE("5", "用户不能参加此活动"), OTHER_ERROR("6", "其他错误"), USER_CAN_JOIN_ACT("99", "用户可以参加活动"), diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java index 2cb94957b..a3714cc6a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java @@ -61,7 +61,11 @@ public class ActCancelItemController { PjcloudUser user = SecurityUtils.getUser(); ActCancelItemDto dto = new ActCancelItemDto(); dto.setReceiverUserId(user.getId()); - dto.setActStatusList(List.of(ActCancelStatusEnum.CANCEL_AWAIT.getCode())); + dto.setActStatusList(List.of( + ActCancelStatusEnum.CANCEL_AWAIT.getCode(), + ActCancelStatusEnum.CANCEL_SUCCESS.getCode(), + ActCancelStatusEnum.CANCEL_EXPIRE.getCode() + )); dto.setIsFindNoExpire(true); return R.ok(actCancelItemService.pageList(page, dto)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java index 371eef0f5..573604353 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java @@ -61,7 +61,11 @@ public class ActCouponRecordController { PjcloudUser user = SecurityUtils.getUser(); ActCouponRecordDto dto = new ActCouponRecordDto(); dto.setUserId(user.getId()); - dto.setStatusCodeList(List.of(ActCouponRecordStatusEnum.UNUSED.getCode())); + dto.setStatusCodeList(List.of( + ActCouponRecordStatusEnum.UNUSED.getCode(), + ActCouponRecordStatusEnum.USED.getCode(), + ActCouponRecordStatusEnum.EXPIRED.getCode() + )); dto.setIsFindNoExpire(true); return R.ok(actCouponRecordService.pageList(page, dto)); } 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 20763c230..fd20c29e8 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 @@ -368,7 +368,11 @@ public class ActCancelItemServiceImpl extends ServiceImpl list) {