From 21b672143b34eb7e7014f3ff6beded581609f086 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 20 八月 2025 10:53:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing into dev
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index e3f45e6..86f17d4 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -131,6 +131,9 @@
orderStatusWarpper.setOrderId(orderPrivateCar.getId());
orderStatusWarpper.setOrderType(1);
orderStatusWarpper.setState(orderPrivateCar.getState());
+ orderStatusWarpper.setPayMethod(orderPrivateCar.getPayMethod());
+ orderStatusWarpper.setOrderMoney(orderPrivateCar.getOrderMoney());
+ orderStatusWarpper.setPaymentAdvanceMoney(orderPrivateCar.getPaymentAdvanceMoney());
data.add(orderStatusWarpper);
}
List<OrderTaxi> list = orderTaxiService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
--
Gitblit v1.7.1