From 1b4203b8e59c6269f3524f499d689ca77161e49a Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 17 Nov 2025 14:51:51 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9AstoreMember=E5=9C=A8expire?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4=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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 d6add1018..4f917ab3d 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 @@ -465,8 +465,7 @@ public class StoreServiceImpl implements IStoreService { Store store = Optional.ofNullable(storeMapper.selectById(storeId)).orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); // 是否已购买会员 StoreMember storeMember = this.storeMemberMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreMember::getStoreId, storeId).eq(StoreMember::getDelFlag, Constants.UNDELETED) - .eq(StoreMember::getMemberStatus, StoreMemberStatus.AUDIT_PASS.getValue())); + .eq(StoreMember::getStoreId, storeId).eq(StoreMember::getDelFlag, Constants.UNDELETED)); BigDecimal serviceAmount = ObjectUtils.defaultIfNull(store.getServiceAmount(), Constants.STORE_ANNUAL_AMOUNT); BigDecimal memberAmount = ObjectUtils.defaultIfNull(store.getMemberAmount(), Constants.STORE_MEMBER_AMOUNT); // 如果档口为正式使用,则返回 diff 值