From a661e711cebd9f0b684dc73ab732b239812f076f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 09:23:08 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 4e6a6a2..945781e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -260,21 +260,19 @@
for (Map<String, Object> map : list3) {
map.put("name", name);
}
- List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>().eq("state", 1)
- .eq("type", 1).eq("userType", 1).eq("userId", uid).eq("orderType", 3).like("remark", "%跨城订单取消退款%"));
- List<Map<String, Object>> list4 = new ArrayList<>();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- for(TransactionDetails transactionDetails1 : transactionDetails){
- Map<String, Object> map = new HashMap<>();
- map.put("money", transactionDetails1.getMoney());
- map.put("time", DateUtil.conversionFormat(language, sdf.format(transactionDetails1.getInsertTime())));
- map.put("name", "跨城订单取消退款");
- map.put("insertTime", Double.valueOf(transactionDetails1.getInsertTime().getTime() / 1000).intValue());
- list4.add(map);
- }
+// List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>().eq("state", 1)
+// .eq("type", 1).eq("userType", 1).eq("userId", uid).eq("orderType", 3).like("remark", "%跨城订单取消退款%"));
+// List<Map<String, Object>> list4 = new ArrayList<>();
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+// for(TransactionDetails transactionDetails1 : transactionDetails){
+// Map<String, Object> map = new HashMap<>();
+// map.put("money", transactionDetails1.getMoney());
+// map.put("time", DateUtil.conversionFormat(language, sdf.format(transactionDetails1.getInsertTime())));
+// map.put("name", "跨城订单取消退款");
+// map.put("insertTime", Double.valueOf(transactionDetails1.getInsertTime().getTime() / 1000).intValue());
+// list4.add(map);
+// }
list.addAll(maps);
-// list.addAll(list1);
-// list.addAll(list2);
list.addAll(list3);
// list.addAll(list4);
--
Gitblit v1.7.1