From 4a016569ba843620279fdeac26c90b7c33748217 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Mar 2023 11:07:24 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 11f0189..d3d0c5a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -878,6 +878,12 @@
         }
 
         BigDecimal score = ObjectUtil.isEmpty(addOrderDto.getScore()) ? BigDecimal.ZERO : addOrderDto.getScore();
+
+        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+        BigDecimal prizeScore = mallMemberWallet.getPrizeScore();
+        if(prizeScore.compareTo(score) < 0){
+            throw new FebsException("积分不足");
+        }
         if(hasTc){
             //系统设置的个人贡献点最大值
             DataDictionaryCustom starGetDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -886,15 +892,9 @@
             if(ObjectUtil.isNotEmpty(starGetDic)){
                 String starGetStr = StrUtil.isEmpty(starGetDic.getValue()) ? "0" : starGetDic.getValue();
                 BigDecimal starGet = new BigDecimal(starGetStr);
-
-                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
                 BigDecimal star = new BigDecimal(mallMemberWallet.getStar());
                 if(starGet.compareTo(BigDecimal.ZERO) != 0 && starGet.compareTo(star) <= 0){
                     throw new FebsException("无法购买套餐");
-                }
-                BigDecimal prizeScore = mallMemberWallet.getPrizeScore();
-                if(prizeScore.compareTo(score) < 0){
-                    throw new FebsException("积分不足");
                 }
             }
         }

--
Gitblit v1.9.1