refactor(消费服务): 优化日志记录与缓存过期时间配置

1. EmployeeBusiness 新增用户信息日志输出，记录`userNumb`与`userId`，便于调试与问题追踪。
2. 包括`XF_ORIGINAL_ID`与`XF_DETAIL_ID`缓存过期时间修改成5小时。

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/EmployeeBusiness.java

@@ -65,6 +65,7 @@ public class EmployeeBusiness {
         departmentVo.setDepartmentName(remoteDeptVo.getDeptName());
 
         // RemoteCardVo remoteCardVo = remoteCardService.queryMainCardByUserId(userAccountVo.getUserId());
+        log.info("userNumb:{},userId:{}", userAccountVo.getUserNumb(), userAccountVo.getUserId());
         String userId = String.valueOf(userAccountVo.getUserId());
         RemoteCardVo remoteCardVo = JsonUtils.parseObject(RedisUtils.getCacheMapValue(CacheNames.PT_USER_CARD_USER_ID, userId).toString(), RemoteCardVo.class);
         UserCardVo userCardVo = new UserCardVo();

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CommonCheck.java

@@ -641,7 +641,7 @@ public class CommonCheck {
         // 将当笔原始消费记录标识放入缓存，1天过期
         Set<String> originalId = Collections.singleton(bo.getOriginalId());
         RedisUtils.setCacheSet(CacheNames.XF_ORIGINAL_ID, originalId);
-        RedisUtils.expire(CacheNames.XF_ORIGINAL_ID, Duration.ofHours(20));
+        RedisUtils.expire(CacheNames.XF_ORIGINAL_ID, Duration.ofHours(5));
 
         // if (ObjectUtil.equals(currentDateStr, consumeDateStr)) {
         // 重置卡天当日消费数据

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/ConsumeRequestCheck.java

@@ -75,8 +75,8 @@ public class ConsumeRequestCheck {
         RemoteMealTypeVo remoteMealTypeVo = commonCheck.getMealType(consumeDate);
         if (ObjectUtil.isEmpty(remoteMealTypeVo)) {
             return commonCheck.createErrorResponse(400, ApiErrorTypeConstants.NOT_FOUND, "不在交易时段",
-                                                   MessageFormat.format("非营业时段,不允许交易。消费时间[{0}]",
-                                                                        DateUtil.format(consumeDate, "HH:mm:ss")));
+                MessageFormat.format("非营业时段,不允许交易。消费时间[{0}]",
+                    DateUtil.format(consumeDate, "HH:mm:ss")));
         }
         // 设置消费记录的当前餐类
         bo.setMealType(Long.valueOf(remoteMealTypeVo.getTypeId()));
@@ -84,7 +84,7 @@ public class ConsumeRequestCheck {
         XfCardLimitedVo xfCardLimitedVo = new XfCardLimitedVo();
         int statusFlag = bo.getStatusFlag();
         if (statusFlag == Integer.parseInt(ConsumeRecordTypeEnum.XFJXF_1.code())
-                || statusFlag == Integer.parseInt(ConsumeRecordTypeEnum.XFJXF_4.code())) {
+            || statusFlag == Integer.parseInt(ConsumeRecordTypeEnum.XFJXF_4.code())) {
 
             // 设备是否可以消费验证
             result = checkTermLimitedAndOther(bo, useTermVo, userCardVo, remoteMealTypeVo);
@@ -107,7 +107,7 @@ public class ConsumeRequestCheck {
         return R.ok();
     }
 
-    private  R<ErrorInfo> obtainResult(R<ErrorInfo> result){
+    private R<ErrorInfo> obtainResult(R<ErrorInfo> result) {
         ErrorInfo data = result.getData();
         String details = Optional.ofNullable(data).map(ErrorInfo::getDetils).orElse("超过消费限制");
         String msg = Optional.ofNullable(data).map(ErrorInfo::getMessage).orElse("消费限制判断存在问题");
@@ -152,7 +152,7 @@ public class ConsumeRequestCheck {
         }
         if (consumeMoney.compareTo(totalBalance) > 0) {
             return commonCheck.createErrorResponse(400, ApiErrorTypeConstants.CONSUME_CHECK_FAIL, "账户余额不足",
-                                                   MessageFormat.format("总余额[{0}],消费金额[{1}]", totalBalance, consumeMoney));
+                MessageFormat.format("总余额[{0}],消费金额[{1}]", totalBalance, consumeMoney));
         }
         // 计算扣费后的余额
         BigDecimal balance = totalBalance.subtract(consumeMoney);
@@ -180,11 +180,11 @@ public class ConsumeRequestCheck {
         String originalId = bo.getOriginalId();
         if (ObjectUtil.isEmpty(originalId)) {
             originalId = RecordIdUtils.getRecordId(bo.getConsumeDate(), bo.getTermNo().shortValue(),
-                                                   bo.getTermRecordId().shortValue(), bo.getUserNo().shortValue(), 0);
+                bo.getTermRecordId().shortValue(), bo.getUserNo().shortValue(), 0);
         }
         if (originalIdSet.contains(originalId)) {
             return commonCheck.createErrorResponse(400, ApiErrorTypeConstants.CONSUME_CHECK_FAIL, "原始消费记录存在",
-                                                   MessageFormat.format("原始消费记录已存在：{0}", originalId));
+                MessageFormat.format("原始消费记录已存在：{0}", originalId));
         }
         bo.setOriginalId(originalId);
 
@@ -227,7 +227,9 @@ public class ConsumeRequestCheck {
      */
     private void initializeCardData(RemoteCardVo cardVo, RemoteMealTypeVo mealVo) {
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime lastPay = CardDateUtils.toLocalDateTime(cardVo.getLastPay());
+        LocalDateTime beforeTime = LocalDateTime.now().plusDays(-1);
+        LocalDateTime lastPay = cardVo.getLastPay() == null ? beforeTime : CardDateUtils.toLocalDateTime(cardVo.getLastPay());
+        // LocalDateTime lastPay = CardDateUtils.toLocalDateTime(cardVo.getLastPay());
 
         log.info("缓存读取的卡片数据：{}", JSONUtil.toJsonStr(cardVo));
         // 餐类数据初始化
@@ -289,7 +291,7 @@ public class ConsumeRequestCheck {
                     R<ErrorInfo> result = task.get();
                     // 如果发现错误且尚未设置错误结果
                     if (result != null && R.isError(result) &&
-                            firstError.compareAndSet(null, result)) {
+                        firstError.compareAndSet(null, result)) {
                         // 取消其他任务（通过中断）
                         taskExecutor.getThreadPoolExecutor().getQueue().clear();
                     }
@@ -325,30 +327,30 @@ public class ConsumeRequestCheck {
         long intervalMin = (currentSec - lastPaySec) / 60;
 
         return intervalMin < ctx.getTermSwipeInterval() ?
-                   commonCheck.createError(TradeStatusEnum.TimeInterval) : null;
+            commonCheck.createError(TradeStatusEnum.TimeInterval) : null;
     }
 
     private R<ErrorInfo> validateSingleLimit(TermConsumeValidationContext ctx) {
         if (ctx.getTermSingleMoney().compareTo(BigDecimal.ZERO) <= 0) return null;
         return ctx.getConsumeValue().compareTo(ctx.getTermSingleMoney()) > 0 ?
-                   commonCheck.createError(TradeStatusEnum.OnceBigMoney) : null;
+            commonCheck.createError(TradeStatusEnum.OnceBigMoney) : null;
     }
 
     private R<ErrorInfo> validateCardValidity(TermConsumeValidationContext ctx) {
         if (ctx.getFactoryId() == 0 || !ctx.isTermUseValidity()) return null;
         return ctx.getCurrentTime().isAfter(ctx.getExpiryTime()) ?
-                   commonCheck.createError(TradeStatusEnum.CardValidDate) : null;
+            commonCheck.createError(TradeStatusEnum.CardValidDate) : null;
     }
 
     private R<ErrorInfo> validateCardType(TermConsumeValidationContext ctx) {
         int mask = 1 << (ctx.getCardType() - 1);
         return (mask & ctx.getTermCardType()) == 0 ?
-                   commonCheck.createError(TradeStatusEnum.CardTypeLimit) : null;
+            commonCheck.createError(TradeStatusEnum.CardTypeLimit) : null;
     }
 
     private R<ErrorInfo> validateMealLimit(TermConsumeValidationContext ctx) {
         return ctx.getTermMealCount() > 0 && ctx.getMealCount() >= ctx.getTermMealCount() ?
-                   commonCheck.createError(TradeStatusEnum.MealLimitTimes) : null;
+            commonCheck.createError(TradeStatusEnum.MealLimitTimes) : null;
     }
 
     private R<ErrorInfo> validateDailyLimit(TermConsumeValidationContext ctx) {

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/ConsumeUploadCheck.java

@@ -71,7 +71,7 @@ public class ConsumeUploadCheck {
                 MessageFormat.format("消费记录已上传：{0}", detailId));
         }
         RedisUtils.setCacheSet(CacheNames.XF_DETAIL_ID, Collections.singleton(detailId));
-        RedisUtils.expire(CacheNames.XF_DETAIL_ID, Duration.ofHours(20));
+        RedisUtils.expire(CacheNames.XF_DETAIL_ID, Duration.ofHours(5));
 
         R<ErrorInfo> result = checkOriginalRecord(bo, userAccountVo);
         if (R.isError(result)) {

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/task/ScheduledTasks.java

@@ -83,7 +83,7 @@ public class ScheduledTasks {
 
     @Scheduled(cron = "0 0 5,9,13,16,20 * * ?")
     public void initConsumeInfo() {
-        // ThreadUtil.execAsync(baseBusiness::initXfCardLimited);
+        ThreadUtil.execAsync(baseBusiness::initXfCardLimited);
         ThreadUtil.execAsync(baseBusiness::initUserCard);
         ThreadUtil.execAsync(baseBusiness::initUserAccount);
     }