From d26d6525fa6ee0a74a3130af5d20997c49303843 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 16 Oct 2025 10:40:50 +0800 Subject: [PATCH] =?UTF-8?q?10-16=20=E6=9F=A5=E8=AF=A2=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=8A=B6=E6=80=81=E7=A0=81=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cash/CashCollectionController.java | 45 ++++++++++++++-------- .../demo/controller/coin/RechargeController.java | 2 +- .../java/com/example/demo/domain/vo/coin/Page.java | 1 + src/main/resources/mapper/WorkBenchMapper.xml | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 8977852..46442bc 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -13,6 +13,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -39,9 +40,13 @@ public class CashCollectionController { //根据精网号获取姓名和地区 @PostMapping("/getNameAndMarket") - public User getNameAndMarket(@RequestBody Integer jwcode) { - return cashCollectionService.getNameAndMarket(jwcode); + public Result getNameAndMarket(@RequestBody Integer jwcode) { + try { + return Result.success(cashCollectionService.getNameAndMarket(jwcode)); + } catch (Exception e) { + return Result.error(e.getMessage()); + } } //获取收款活动列表 @PostMapping("/getActivityList") @@ -81,22 +86,30 @@ public class CashCollectionController { } //多条件查询收款订单列表 @PostMapping("/selectCollection") - public PageInfo selectCollection( - @RequestBody Page page) throws Exception{ - Integer pageNum = page.getPageNum(); - Integer pageSize = page.getPageSize(); - CashCollection cashCollection = page.getCashCollection(); - //解token权限 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader("token"); - Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); - if (admin != null) { + public Result selcetAll(@RequestBody Page page){ + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + //解token权限 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + if (admin != null) { List list = Arrays.asList(admin.getMarkets().split(",")); - cashCollection.setMarkets(list); + page.getCashCollection().setMarkets(list);} + else{ + return Result.error("角色为空"); + } - } - return cashCollectionService.selectCollection(pageNum, pageSize, cashCollection); - } + return Result.success(cashCollectionService.selectCollection(page.getPageNum(), page.getPageSize(),page.getCashCollection())); + }} catch (Exception e) { + return Result.error(e.getMessage()); + + }} //补全手续费等 @PostMapping("/complete") public Result complete(@RequestBody CashRecord cashRecord) { diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index 38ee28d..f3c773a 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -63,7 +63,7 @@ public class RechargeController { return Result.success(rechargeService.selectAll(page.getPageNum(), page.getPageSize(),page.getRechargeUser())); } } catch (Exception e) { - return Result.error("请检查筛选数据的格式"); + return Result.error(e.getMessage()); } diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index 79aa823..ec84775 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -44,4 +44,5 @@ public class Page { private HistoryRecord historyRecord; //历史记录 private CashCollection cashCollection; //现金收款 private CashRecordDone cashRecordDone; + } diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index 7c61e4c..abc85fb 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -178,7 +178,7 @@ SUM(CASE WHEN r.id = 6 THEN cr.received_amount ELSE 0 END) AS cad, SUM(CASE WHEN r.id = 7 THEN cr.received_amount ELSE 0 END) AS vdn, SUM(CASE WHEN r.id = 8 THEN cr.received_amount ELSE 0 END) AS krw, - NULL AS totalSGD -- 后续再用汇率折算 + ROUND( SUM(cr.received_amount * r.num), 2) AS totalSGD FROM cash_record cr JOIN market m ON cr.received_market = m.id JOIN rate r ON cr.received_currency = r.id