From 84b78742375b4f22bc2a8a4801e3f2a2bbf565e7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 31 Oct 2025 17:14:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet/controller/act/ActCancelItemController.java |  1 +
 .../service/impl/act/ActCancelItemServiceImpl.java     | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

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 077d39c7d..f2a2c0864 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
@@ -57,6 +57,7 @@ public class ActCancelItemController {
     @Idempotent(expireTime = 2, key = "'/act/cancel/app/get/' + #dto.getReceiverUserId()", info = "正在领取中，请勿重复操作")
     public R<Long> appGet(@RequestBody ActCancelItemDto dto) {
         if (ObjectUtil.isEmpty(dto.getActId())) throw new RuntimeException("活动id不能为空");
+        if (ObjectUtil.isEmpty(dto.getMchId())) throw new RuntimeException("商户id不能为空");
         PjcloudUser user = SecurityUtils.getUser();
         return R.ok(actCancelItemService.appGet(user, 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 232009c35..9282751cf 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
@@ -127,15 +127,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
         ActCancelEntity act = actCancelMapper.selectById(dto.getActId());
         if (ObjectUtil.isEmpty(act)) throw new RuntimeException("核销活动不存在");
         // 获取商户
-        MchManageEntity actMch = null;
-        try {
-            Long mchId = ParamResolver.getLong("ACT_CANCEL_MCH_ID");
-            if (ObjectUtil.isEmpty(mchId)) throw new Exception("活动商户id为空");
-            actMch = mchManageService.getById(mchId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("|{}|获取商户ID失败,error:|{}|", TAG, e.getMessage());
-        }
+        MchManageEntity actMch = mchManageService.getById(dto.getMchId());
         if (ObjectUtil.isEmpty(actMch)) throw new RuntimeException("核销活动商户不存在");
 
         // 判断是否已经领取