From ef30d6b279e12666f7a899add848587033018eca Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 5 Nov 2025 22:00:42 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E6=AD=A3=E5=BC=8F=E7=89=88=20=E6=88=96=20=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/StoreController.java | 6 ++-- .../controller/xkt/StoreMemberController.java | 7 ----- .../xkt/vo/store/StoreExpireResVO.java | 10 +++++-- .../xkt/dto/store/StoreExpireResDTO.java | 11 ++++++-- .../xkt/service/IStoreMemberService.java | 7 ----- .../com/ruoyi/xkt/service/IStoreService.java | 3 +- .../service/impl/StoreMemberServiceImpl.java | 20 ------------- .../xkt/service/impl/StoreServiceImpl.java | 28 +++++++++---------- 8 files changed, 32 insertions(+), 60 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java index fa5e0dbe4..841154dae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java @@ -100,9 +100,9 @@ public class StoreController extends XktBaseController { } @ApiOperation(value = "档口过期时间", httpMethod = "GET", response = R.class) - @GetMapping(value = "/expire/{storeId}/{target}") - public R getExpireInfo(@PathVariable("storeId") Long storeId, @PathVariable("target") Integer target) { - return R.ok(BeanUtil.toBean(storeService.getExpireInfo(storeId, target), StoreExpireResVO.class)); + @GetMapping(value = "/expire/{storeId}") + public R getExpireInfo(@PathVariable("storeId") Long storeId) { + return R.ok(BeanUtil.toBean(storeService.getExpireInfo(storeId), StoreExpireResVO.class)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java index b99e947f8..72bfa3bb9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java @@ -53,13 +53,6 @@ public class StoreMemberController extends XktBaseController { } - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") - @ApiOperation(value = "获取档口会员过期时间", httpMethod = "GET", response = R.class) - @GetMapping("/expire/{storeId}") - public R expire(@PathVariable Long storeId) { - return R.ok(BeanUtil.toBean(storeMemberService.expire(storeId), StoreMemberExpireResVO.class)); - } - // TODO 每天获取档口会员过期提醒 // TODO 每天获取档口会员过期提醒 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreExpireResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreExpireResVO.java index aad6fe051..0ecc5a7d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreExpireResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreExpireResVO.java @@ -18,9 +18,13 @@ public class StoreExpireResVO { @ApiModelProperty(value = "档口ID") private Long storeId; - @ApiModelProperty(value = "目标 1[正式版] 2[实力质造会员]") - private Integer target; - @ApiModelProperty(value = "试用过期时间 正式版过期时间 会员过期时间") + @ApiModelProperty(value = "试用过期时间 正式版过期时间") private Date serviceEndTime; + @ApiModelProperty(value = "试用金额 正式版金额") + private BigDecimal serviceAmount; + @ApiModelProperty(value = "会员过期时间") + private Date memberEndTime; + @ApiModelProperty(value = "会员金额") + private BigDecimal memberAmount; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreExpireResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreExpireResDTO.java index e375e2251..53789e43f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreExpireResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreExpireResDTO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; import java.util.Date; /** @@ -19,9 +20,13 @@ public class StoreExpireResDTO { @ApiModelProperty(value = "档口ID") private Long storeId; - @ApiModelProperty(value = "目标 1[正式版] 2[实力质造会员]") - private Integer target; - @ApiModelProperty(value = "试用过期时间 正式版过期时间 会员过期时间") + @ApiModelProperty(value = "试用过期时间 正式版过期时间") private Date serviceEndTime; + @ApiModelProperty(value = "试用金额 正式版金额") + private BigDecimal serviceAmount; + @ApiModelProperty(value = "会员过期时间") + private Date memberEndTime; + @ApiModelProperty(value = "会员金额") + private BigDecimal memberAmount; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreMemberService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreMemberService.java index 624a4ed6c..e6a38d3a2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreMemberService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreMemberService.java @@ -30,11 +30,4 @@ public interface IStoreMemberService { */ Page page(StoreMemberPageDTO pageDTO); - /** - * 获取档口会员过期时间 - * - * @param storeId 档口ID - * @return StoreMemberExpireResDTO - */ - StoreMemberExpireResDTO expire(Long storeId); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java index 622d81f39..1e902db78 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java @@ -196,8 +196,7 @@ public interface IStoreService { * 获取档口到期信息 * * @param storeId 档口ID - * @param target 目标 1[正式版] 2[实力质造会员] * @return StoreExpireResDTO */ - StoreExpireResDTO getExpireInfo(Long storeId, Integer target); + StoreExpireResDTO getExpireInfo(Long storeId); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java index 927836f91..97223e04b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java @@ -135,25 +135,5 @@ public class StoreMemberServiceImpl implements IStoreMemberService { : Page.convert(new PageInfo<>(list)); } - /** - * 获取档口会员过期时间 - * - * @param storeId 档口ID - * @return StoreMemberExpireResDTO - */ - @Override - @Transactional(readOnly = true) - public StoreMemberExpireResDTO expire(Long storeId) { - // 用户是否为档口管理者或子账户 - if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(storeId)) { - throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR); - } - Date todayStart = Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()); - StoreMember storeMember = this.storeMemberMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreMember::getStoreId, storeId).eq(StoreMember::getDelFlag, Constants.UNDELETED) - .le(StoreMember::getStartTime, todayStart)); - return BeanUtil.toBean(storeMember, StoreMemberExpireResDTO.class); - } - } 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 8b170f5fe..bf68f3e93 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 @@ -434,26 +434,24 @@ public class StoreServiceImpl implements IStoreService { * 获取档口到期信息 * * @param storeId 档口ID - * @param target 目标 1[正式版] 2[实力质造会员] * @return StoreExpireResDTO */ @Override @Transactional(readOnly = true) - public StoreExpireResDTO getExpireInfo(Long storeId, Integer target) { + public StoreExpireResDTO getExpireInfo(Long storeId) { Store store = Optional.ofNullable(storeMapper.selectById(storeId)).orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); - StoreExpireResDTO expireDTO = new StoreExpireResDTO().setStoreId(storeId).setTarget(target); - // 购买正式版 - if (Objects.equals(target, 1)) { - expireDTO.setServiceEndTime(store.getServiceEndTime()); - // 购买档口会员 - } else if (Objects.equals(target, 2)) { - // 获取档口会员 - Date todayStart = Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()); - StoreMember storeMember = this.storeMemberMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreMember::getStoreId, storeId).eq(StoreMember::getDelFlag, Constants.UNDELETED) - .le(StoreMember::getStartTime, todayStart)); - expireDTO.setServiceEndTime(ObjectUtils.isNotEmpty(storeMember) ? storeMember.getEndTime() : null); - } + StoreExpireResDTO expireDTO = new StoreExpireResDTO().setStoreId(storeId).setServiceEndTime(store.getServiceEndTime()); + // 获取档口会员 + Date todayStart = Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()); + StoreMember storeMember = this.storeMemberMapper.selectOne(new LambdaQueryWrapper() + .eq(StoreMember::getStoreId, storeId).eq(StoreMember::getDelFlag, Constants.UNDELETED) + .le(StoreMember::getStartTime, todayStart)); + expireDTO.setServiceEndTime(ObjectUtils.isNotEmpty(storeMember) ? storeMember.getEndTime() : null); + + // TODO 获取购买正式版金额 + + // TODO 获取购买会员金额 + return expireDTO; }