Quellcode durchsuchen

fix: 消费服务
1.解决请求消费上下文的卡片过期数据取错的问题

luoyb vor 9 Monaten
Ursprung
Commit
38c1a46790

+ 0 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CardConsumeValidation.java

@@ -312,7 +312,6 @@ public class CardConsumeValidation {
             .filter(p -> cardType.equals(p.getCardType())
                 && mealType.equals(p.getMealType())
                 && validationParam.getIsUse().equals(p.getStatus())).findFirst().orElse(null);
-        ;
 
         XfCardLimitedVo cardLimitedVo = ctx.getCardLimitedVo();
         if (discountVo != null) {

+ 1 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/TermConsumeValidationContext.java

@@ -69,7 +69,7 @@ public class TermConsumeValidationContext {
         context.mealMoney = cardVo.getMealTotal();
         context.currentTime = LocalDateTime.now();
         context.lastPayTime = CardDateUtils.toLocalDateTime(cardVo.getLastPay());
-        context.expiryTime = CardDateUtils.toLocalDateTime(cardVo.getLastPay());
+        context.expiryTime = CardDateUtils.toLocalDateTime(cardVo.getLifespan());
 
         return context;
     }