From 633c21bff8e30e0bd530e12a339a32dfdf8e262d Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Tue, 19 Aug 2025 15:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccountRechargeController.java | 27 +- .../AccountRechargeRouteController.java | 5 + .../operator/IAccountRechargeDao.java | 2 + .../IAccountRechargeService.java | 2 +- .../impl/AccountRechargeServiceImpl.java | 7 + .../account-recharge-mapper.xml | 60 +++ .../accountrecharge/recharge-list.html | 355 ++++++++++++++++++ 7 files changed, 456 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/templates/accountrecharge/recharge-list.html diff --git a/src/main/java/cn/com/tenlion/operator/controller/api/accountrecharge/AccountRechargeController.java b/src/main/java/cn/com/tenlion/operator/controller/api/accountrecharge/AccountRechargeController.java index 580b990..9951f8b 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/api/accountrecharge/AccountRechargeController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/api/accountrecharge/AccountRechargeController.java @@ -151,6 +151,24 @@ public class AccountRechargeController extends DefaultBaseController { return accountRechargeService.listPage(page); } + @ApiOperation(value = "账户充值分页列表", notes = "账户充值分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage2") + public SuccessResultList> listPage2(ListPage page) { + Map params = requestParams(); + params.put("rechargeCheck", "2"); + params.put("reconciliationStatus", "1"); + page.setParams(params); + return accountRechargeService.listPage(page); + } + @ApiOperation(value = "账户充值分页列表", notes = "账户充值分页列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), @@ -165,7 +183,7 @@ public class AccountRechargeController extends DefaultBaseController { Map params = requestParams(); params.put("rechargeCheck", "2"); params.put("reconciliationStatus", "1"); - params.put("accountId", params.get("accountId") == null ? "-1" : params.get("accountId")); + params.put("accountId", params.get("accountId") == null ? "" : params.get("accountId")); page.setParams(params); return accountRechargeService.listPage(page); } @@ -177,5 +195,12 @@ public class AccountRechargeController extends DefaultBaseController { Map params = requestParams(); return new SuccessResultData<>(accountRechargeService.count(params)); } + @ApiOperation(value = "账户充值统计", notes = "账户充值统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("total-sum") + SuccessResultData totalSum() { + Map params = requestParams(); + return new SuccessResultData<>(accountRechargeService.totalSum(params)); + } } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/controller/route/accountrecharge/AccountRechargeRouteController.java b/src/main/java/cn/com/tenlion/operator/controller/route/accountrecharge/AccountRechargeRouteController.java index d641277..2fe9735 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/route/accountrecharge/AccountRechargeRouteController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/route/accountrecharge/AccountRechargeRouteController.java @@ -102,6 +102,11 @@ public class AccountRechargeRouteController extends DefaultBaseController { return mv; } + @GetMapping("recharge-list") + public ModelAndView rechargeList() { + return new ModelAndView("accountrecharge/recharge-list"); + } + @GetMapping("list") public ModelAndView list() { return new ModelAndView("accountrecharge/list"); diff --git a/src/main/java/cn/com/tenlion/operator/daoother/operator/IAccountRechargeDao.java b/src/main/java/cn/com/tenlion/operator/daoother/operator/IAccountRechargeDao.java index 5754236..81b42cb 100644 --- a/src/main/java/cn/com/tenlion/operator/daoother/operator/IAccountRechargeDao.java +++ b/src/main/java/cn/com/tenlion/operator/daoother/operator/IAccountRechargeDao.java @@ -128,4 +128,6 @@ public interface IAccountRechargeDao { Integer getTodayByAccountId(String userId); List getCanIsSueInvoices(Map params); + + Double totalSum(Map params); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/IAccountRechargeService.java b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/IAccountRechargeService.java index ed6595b..b47ad42 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/IAccountRechargeService.java +++ b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/IAccountRechargeService.java @@ -26,9 +26,9 @@ public interface IAccountRechargeService { /** * 新增账户充值 * - * @param accountRechargeVO * @return */ + Double totalSum(Map params); void save(AccountRechargeVO accountRechargeVO); void saveSystemReduce(AccountRechargeVO accountRechargeVO); diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java index 3fcabc9..aa96779 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java @@ -118,6 +118,12 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA return new SuccessResultList<>(accountRechargeDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public Double totalSum(Map params) { + Double totalSum = accountRechargeDao.totalSum(params); + return totalSum; + } + @Override public void save(AccountRechargeVO accountRechargeVO) { saveReturnId(accountRechargeVO); @@ -471,6 +477,7 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA PageHelper.startPage(page.getPage(), page.getRows()); List accountRechargeDTOs = accountRechargeDao.list(page.getParams()); + Map user = new HashMap<>(); for(AccountRechargeDTO dto : accountRechargeDTOs) { if (user.get(dto.getCreator()) != null) { diff --git a/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml b/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml index e5c3699..92c6d09 100644 --- a/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml +++ b/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml @@ -576,6 +576,66 @@ #{selectedRechargeIds[${index}]} + + t1.recharge_money ${orderMode} + + + t1.id DESC + + + + diff --git a/src/main/resources/templates/accountrecharge/recharge-list.html b/src/main/resources/templates/accountrecharge/recharge-list.html new file mode 100644 index 0000000..63cfd5b --- /dev/null +++ b/src/main/resources/templates/accountrecharge/recharge-list.html @@ -0,0 +1,355 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + +
+
+
+ +
+
+
+
+
+ + + + + \ No newline at end of file