From d4a5e9aaa0b21ebb057b11c9210f215e97b1696d Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 4 Dec 2025 17:15:49 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=B9=B4=E8=B4=B9BUG=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 72c3c5473..fc046b9c3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -533,7 +533,7 @@ public class StoreServiceImpl implements IStoreService { Store store = Optional.ofNullable(storeMapper.selectById(buyAnnualDTO.getStoreId())).orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); // 判断扣费金额和折扣金额是否一致(设置了折扣,就用折扣,反之取默认金额) final BigDecimal serviceAmount = ObjectUtils.defaultIfNull(store.getServiceAmount(), Constants.STORE_ANNUAL_AMOUNT); - if (!Objects.equals(serviceAmount, buyAnnualDTO.getPayPrice())) { + if (serviceAmount.compareTo(buyAnnualDTO.getPayPrice()) != 0) { throw new ServiceException("付费金额与核定金额不一致!请联系平台客服", HttpStatus.ERROR); } // 如果是使用版 storeStatus 为3,更新为正式版 storeStatus 为4