From 016ddc332273c36e437a6f3b5f0a25574d5b7b78 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 05 九月 2025 09:12:43 +0800 Subject: [PATCH] bug修改 --- DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java index 5635a41..c9158ef 100644 --- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java +++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java @@ -881,6 +881,22 @@ baseWarpper.setRemark(String.valueOf(map.get("remark"))); data.add(baseWarpper); } + List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>() + .eq("type", 1) + .eq("userId", uid) + .eq("state", 2) + .eq("userType", 2) + .eq("orderType", 7)); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + for (TransactionDetails transactionDetail : transactionDetails) { + BaseWarpper baseWarpper = new BaseWarpper(); + baseWarpper.setDay(format.format(transactionDetail.getInsertTime())); + baseWarpper.setAmount(transactionDetail.getMoney()); + baseWarpper.setRemark(transactionDetail.getRemark()); + baseWarpper.setName("平台扣除"); + baseWarpper.setData(new HashMap<>()); + data.add(baseWarpper); + } return ResultUtil.success(data); }catch (Exception e){ e.printStackTrace(); -- Gitblit v1.7.1