diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java index 08a9f8848..4e8425e79 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java @@ -201,13 +201,20 @@ public class WalletManageController { return R.ok(walletManageService.scopeQbPage(page, dto, dataScope)); } - @Operation(summary = "不活跃用户钱包", description = "不活跃用户钱包") + @Operation(summary = "不活跃用户统计", description = "不活跃用户统计") @PostMapping("/page-join-active") public R> pageJoinActive(@ParameterObject Page page, @RequestBody WalletTopupActionDto dto) { DataScope dataScope = new DataScope(); return R.ok(walletManageService.pageJoinActive(page, dto, dataScope)); } + @Operation(summary = "不活跃用户统计list", description = "不活跃用户统计list") + @PostMapping("/list-list-active") + public R> listActive(@RequestBody WalletTopupActionDto dto) { + DataScope dataScope = new DataScope(); + return R.ok(walletManageService.pageListActive(dto, dataScope)); + } + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") @PreAuthorize("@pms.hasPermission('wallet_walletManage_view')") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java index 2ee615a43..7675c5c2d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java @@ -162,4 +162,6 @@ public interface WalletManageMapper extends PjcloudBaseMapper selectBalance(@Param("dto") WalletManageBalanceDto walletDto); Page activeBalancePage(Page page, @Param("dto") WalletTopupActionDto dto, @Param("unactiveDayNumberStr") String unactiveDayNumberStr); + + List activeBalanceList(@Param("dto") WalletTopupActionDto dto, @Param("unactiveDayNumberStr") String unactiveDayNumberStr); } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java index 3dd3d8fd8..64b29d7da 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java @@ -68,6 +68,11 @@ public interface WalletManageService extends IService { */ Page pageJoinActive(Page page, WalletTopupActionDto dto, DataScope dataScope); + /** + * 不活跃用户钱包 + */ + List pageListActive(WalletTopupActionDto dto, DataScope dataScope); + List scopeQbList(WalletManageBalanceDto dto, DataScope dataScope); WalletManageVo join(Long walletId); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java index 71967b394..4c7c26962 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java @@ -298,6 +298,20 @@ public class WalletManageServiceImpl extends ServiceImpl pageListActive(WalletTopupActionDto dto, DataScope dataScope) { + if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) { + dto.setUnactiveMonthsNumber(3L); + } + String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN); + List list = baseMapper.activeBalanceList(dto, unactiveDayNumberStr); + disposeList(list); + return list; + } + @Override public List scopeQbList(WalletManageBalanceDto dto, DataScope dataScope) { WalletManageDto walletDto = BeanUtils.toBean(dto, WalletManageDto.class); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml index e6b6e29f8..bc74a132c 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml @@ -34,7 +34,7 @@ a.freeze_price, a.is_freeze, a.active_bind_time, - a.active_bind_status, + a.status, a.create_by, a.create_time, a.update_by, @@ -44,7 +44,6 @@ - - + - + - + + + + \ No newline at end of file