From ddf9af76b59df0d93a9a406b909bb68976b7a298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Mon, 26 Aug 2024 17:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 7cf3b00..4a9cc30 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1613,13 +1613,15 @@ public class PayService {
             return Result.fail(CodeEnum.STAFFNOEXISTERROE);
         }
 
+        if("master".equals(staff.getType())){
+            return Result.success(SUCCESS,new BigDecimal(0.1));
+        }
+
         if(ObjectUtil.isEmpty(staff.getMaxDiscountAmount())||ObjectUtil.isNull(staff.getMaxDiscountAmount())){
             return Result.success(SUCCESS,BigDecimal.ZERO);
         }
 
-        if("master".equals(staff.getType())){
-            return Result.success(SUCCESS,new BigDecimal(0.1));
-        }
+
 
         if("0".equals(staff.getDiscountType())){