From 10a114cf95e58bf6918b89801287ee3ab53fac5e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 3 Feb 2026 16:30:59 +0800
Subject: [PATCH] 111

---
 .../wallet/service/impl/act/ActCouponRecordServiceImpl.java     | 2 +-
 .../wallet/utils/act/service/ActCouponComUtilService.java       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 a04ec8620..88e40af05 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
@@ -167,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) && false) {
+            if (ObjectUtil.isEmpty(userMch)) {
                 log.info("|{}|{}用户参加{}活动失败:不是食堂用户,用户属于食堂{}", TAG, sysUser.getName(), uniqueCode, JSONUtil.toJsonStr(userMch));
                 return ActUserReceiveEnum.USER_CANNOT_PARTICIPATE;
             }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/act/service/ActCouponComUtilService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/act/service/ActCouponComUtilService.java
index 41795e88e..f04c513ab 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/act/service/ActCouponComUtilService.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/act/service/ActCouponComUtilService.java
@@ -13,11 +13,13 @@ import com.bsd.pjcloud.wallet.service.ActCouponLifecycleService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Array;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
 
 /**
  * @author liusiyang_dxm