From e70f0cc17b3377a1e200490df94cda368098ff08 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 26 Jul 2023 14:24:26 +0800 Subject: [PATCH] 短信认证 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java index 08fb713..f26cca9 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -135,6 +135,16 @@ */ @GetMapping("getMoneyFlowList") public FebsResponse getMoneyFlowList(MoneyFlowListDto moneyFlowListDto, QueryRequest request) { + String startTime = moneyFlowListDto.getStartTime(); + String endTime = moneyFlowListDto.getEndTime(); + if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){ + DateTime dateStartTime= DateUtil.parseDate(startTime); + DateTime dateEndTime = DateUtil.parseDate(endTime); + int compare = DateUtil.compare(dateStartTime, dateEndTime); + if(compare >= 0){ + return new FebsResponse().fail().message("请输入正确的开始时间和结束时间"); + } + } Map<String, Object> data = getDataTable(mallMemberService.getMoneyFlowListInPage(moneyFlowListDto, request)); return new FebsResponse().success().data(data); } @@ -218,6 +228,16 @@ @ControllerEndpoint(exceptionMessage = "获取等级失败") public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() { return mallMemberService.getAgentLevelOption(); + } + + /** + * 代理-等级选择Option + */ + @GetMapping("agentLevelOption/tree") + @ControllerEndpoint(exceptionMessage = "获取等级失败") + public List<AdminAgentLevelOptionTreeVo> agentLevelOption() { +// return mallMemberService.getAgentLevelOption(); + return mallMemberService.agentLevelOption(); } @@ -524,4 +544,13 @@ return mallMemberService.agentAddress(); } + /** + * 合伙人申请列表-更新 + */ + @PostMapping("agentVerifyUpdate") + @ControllerEndpoint(operation = "合伙人申请列表-更新", exceptionMessage = "操作失败") + public FebsResponse agentVerifyUpdate(@Valid AdminAgentVerifyVo adminAgentVerifyVo) { + return mallMemberService.agentVerifyUpdate(adminAgentVerifyVo); + } + } -- Gitblit v1.9.1