111

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;
             }

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