From 0be58dbf7774fef98ddac83c3f454b49c6d5a6c1 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 07 七月 2023 18:18:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java index 39f368d..2111e73 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java @@ -463,8 +463,28 @@ @Override public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId) { - System.out.println("账单传参:yearMonth"+yearMonth+"|"+"recordId"+recordId); - // TODO: 2023/7/4 - return null; + BillingDetailsVo vo = new BillingDetailsVo(); + if (null != yearMonth){ + Date monthStart = DateTimeHelper.getCurrentIdetMouthStart(yearMonth); + Date monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(yearMonth); + + + }else { + Date currentMouthStart = DateTimeHelper.getCurrentMouthStart(); + Date currentMouthEnd = DateTimeHelper.getCurrentMouthEnd(); + + + } + return vo; } + + @Override + public void cancellation(Integer appUserId) { + TAppUser tAppUser = this.baseMapper.selectById(appUserId); + if (null != tAppUser){ + tAppUser.setState(3); + this.baseMapper.updateById(tAppUser); + } + } + } -- Gitblit v1.7.1