Procházet zdrojové kódy

perf(消费服务): 限次、限额和折扣验证处理

1.加了日志输出
autumnal_wind před 11 měsíci
rodič
revize
71f9e4010a

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/dubbo/RemoteXfLimitedServiceImpl.java

@@ -63,7 +63,7 @@ public class RemoteXfLimitedServiceImpl implements RemoteXfLimitedService {
     public Long queryLimitedTermIdByTermId(Long termId) {
     public Long queryLimitedTermIdByTermId(Long termId) {
         XfLimitedTermVo vo = limitedTermService.queryByTermId(termId);
         XfLimitedTermVo vo = limitedTermService.queryByTermId(termId);
         if (ObjectUtil.isNotEmpty(vo)) {
         if (ObjectUtil.isNotEmpty(vo)) {
-            return vo.getLimitedTermId();
+            return vo.getTermId();
         }
         }
         return 0L;
         return 0L;
     }
     }

+ 1 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfLimitedServiceImpl.java

@@ -149,6 +149,7 @@ public class XfLimitedServiceImpl implements IXfLimitedService {
     public XfLimitedVo queryByCardType(Integer cardType) {
     public XfLimitedVo queryByCardType(Integer cardType) {
         XfLimitedBo bo = new XfLimitedBo();
         XfLimitedBo bo = new XfLimitedBo();
         bo.setCardType(cardType.longValue());
         bo.setCardType(cardType.longValue());
+        bo.setStatus("1");
         List<XfLimitedVo> list = this.queryList(bo);
         List<XfLimitedVo> list = this.queryList(bo);
         if (CollectionUtil.isNotEmpty(list)) {
         if (CollectionUtil.isNotEmpty(list)) {
             return list.get(0);
             return list.get(0);

+ 0 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/InitBusiness.java

@@ -184,7 +184,6 @@ public class InitBusiness {
      * @param id 人员Id
      * @param id 人员Id
      */
      */
     public void initUserBalanceByUserId(Long id) {
     public void initUserBalanceByUserId(Long id) {
-        String userId = String.valueOf(id);
         BigDecimal balance = bagService.getUserTotalBalance(id);
         BigDecimal balance = bagService.getUserTotalBalance(id);
         log.info("初始化指定人员余额完成,人员Id:{}, 余额:{}", id, balance);
         log.info("初始化指定人员余额完成,人员Id:{}, 余额:{}", id, balance);
     }
     }

+ 8 - 7
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CardConsumeValidation.java

@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
 
 
 /**
 /**
  * 卡片消费校验
  * 卡片消费校验
@@ -264,19 +263,19 @@ public class CardConsumeValidation {
     //region 卡片限次处理
     //region 卡片限次处理
     private R<ErrorInfo> dealCardLimited(CardConsumeValidationContext ctx) {
     private R<ErrorInfo> dealCardLimited(CardConsumeValidationContext ctx) {
         if (!validationParam.getXC_CONSUME()) {
         if (!validationParam.getXC_CONSUME()) {
-            log.debug("全局限次功能未启用,跳过限次验证");
+            log.warn("全局限次功能未启用,跳过限次验证");
             return R.ok();
             return R.ok();
         }
         }
 
 
         List<String> termIds = validationParam.getLimitedTermIdList();
         List<String> termIds = validationParam.getLimitedTermIdList();
         String currentTermId = String.valueOf(ctx.getTermId());
         String currentTermId = String.valueOf(ctx.getTermId());
         if (CollectionUtil.isEmpty(termIds) || !termIds.contains(currentTermId)) {
         if (CollectionUtil.isEmpty(termIds) || !termIds.contains(currentTermId)) {
-            log.debug("终端[{}]未配置限次功能,跳过限次验证", ctx.getTermNo());
+            log.warn("终端[{}]未配置限次功能,跳过限次验证", ctx.getTermNo());
             return R.ok();
             return R.ok();
         }
         }
         List<RemoteLimitedVo> limitedCards = validationParam.getLimitedCardList();
         List<RemoteLimitedVo> limitedCards = validationParam.getLimitedCardList();
         if (CollectionUtil.isEmpty(limitedCards)) {
         if (CollectionUtil.isEmpty(limitedCards)) {
-            log.debug("未配置卡类限次功能,跳过限次验证");
+            log.warn("未配置限次卡类,跳过限次验证");
             return R.ok();
             return R.ok();
         }
         }
         Long cardType = ctx.getCardType();
         Long cardType = ctx.getCardType();
@@ -284,6 +283,7 @@ public class CardConsumeValidation {
             .filter(p -> cardType.equals(p.getCardType())
             .filter(p -> cardType.equals(p.getCardType())
                 && validationParam.getIsUse().equals(p.getStatus())).findFirst().orElse(null);
                 && validationParam.getIsUse().equals(p.getStatus())).findFirst().orElse(null);
         if (limitedVo == null) {
         if (limitedVo == null) {
+            log.warn("卡类[{}]未配置限次功能,跳过限次验证", cardType);
             return R.ok();
             return R.ok();
         }
         }
 
 
@@ -354,19 +354,19 @@ public class CardConsumeValidation {
     //region 卡片限额处理
     //region 卡片限额处理
     private R<ErrorInfo> dealCardQuota(CardConsumeValidationContext ctx) {
     private R<ErrorInfo> dealCardQuota(CardConsumeValidationContext ctx) {
         if (!validationParam.getXE_CONSUME()) {
         if (!validationParam.getXE_CONSUME()) {
-            log.debug("全局限额功能未启用,跳过限额验证");
+            log.warn("全局限额功能未启用,跳过限额验证");
             return R.ok();
             return R.ok();
         }
         }
 
 
         List<String> termIds = validationParam.getQuotaTermIdList();
         List<String> termIds = validationParam.getQuotaTermIdList();
         String currentTermId = String.valueOf(ctx.getTermId());
         String currentTermId = String.valueOf(ctx.getTermId());
         if (CollectionUtil.isEmpty(termIds) || !termIds.contains(currentTermId)) {
         if (CollectionUtil.isEmpty(termIds) || !termIds.contains(currentTermId)) {
-            log.debug("终端[{}]未配置限额功能,跳过限额验证", ctx.getTermNo());
+            log.warn("终端[{}]未配置限额功能,跳过限额验证", ctx.getTermNo());
             return R.ok();
             return R.ok();
         }
         }
         List<RemoteQuotaVo> quotaCards = validationParam.getQuotaCardList();
         List<RemoteQuotaVo> quotaCards = validationParam.getQuotaCardList();
         if (CollectionUtil.isEmpty(quotaCards)) {
         if (CollectionUtil.isEmpty(quotaCards)) {
-            log.debug("未配置卡类限额功能,跳过限额验证");
+            log.warn("未配置卡类限额功能,跳过限额验证");
             return R.ok();
             return R.ok();
         }
         }
         Long cardType = ctx.getCardType();
         Long cardType = ctx.getCardType();
@@ -374,6 +374,7 @@ public class CardConsumeValidation {
             .filter(p -> cardType.equals(p.getCardType())
             .filter(p -> cardType.equals(p.getCardType())
                 && validationParam.getIsUse().equals(p.getStatus())).findFirst().orElse(null);
                 && validationParam.getIsUse().equals(p.getStatus())).findFirst().orElse(null);
         if (quotaVo == null) {
         if (quotaVo == null) {
+            log.warn("卡类[{}]未配置限额功能,跳过限额验证", cardType);
             return R.ok();
             return R.ok();
         }
         }