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())){