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 4c7c26962..0785c8c36 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 @@ -289,7 +289,7 @@ public class WalletManageServiceImpl extends ServiceImpl pageJoinActive(Page page, WalletTopupActionDto dto, DataScope dataScope) { - if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) { + if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) { dto.setUnactiveMonthsNumber(3L); } String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN); @@ -303,7 +303,7 @@ public class WalletManageServiceImpl extends ServiceImpl pageListActive(WalletTopupActionDto dto, DataScope dataScope) { - if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) { + if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) { dto.setUnactiveMonthsNumber(3L); } String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN); 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 bc74a132c..ec06c85d2 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 @@ -125,7 +125,7 @@ - + - + group by a.user_id \ No newline at end of file