From f1ba329891967bca6d083a9d5722683a9fa2080b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 09:17:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing
---
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