From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 11:20:28 +0800
Subject: [PATCH] 更新代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 5c852ae..0a3e8df 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -122,16 +122,10 @@
private IOrderPositionService orderPositionService;
@Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
private IOrderCancelService orderCancelService;
@Value("${filePath}")
private String filePath;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
@Value("${callbackPath}")
private String callbackPath;
@@ -158,8 +152,15 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
- return orderCrossCityMapper.queryOrderList(state, driverId);
+ public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
+ List<Map<String, Object>> list = orderCrossCityMapper.queryOrderList(state, driverId);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+ return list;
}
/**
@@ -170,8 +171,15 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderCrossCityMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
+ List<Map<String, Object>> list = orderCrossCityMapper.queryMyAllOrder(state, uid);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+ return list;
}
@@ -182,7 +190,7 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = new HashMap<>();
OrderCrossCity orderCrossCity = this.selectById(orderId);
List<Map<String, Object>> order = orderCrossCityMapper.queryOrderInfo(orderCrossCity.getOrderNum());
@@ -190,6 +198,18 @@
Double serverMoney = 0D;
Double totalMoney = 0D;
for(Map<String, Object> m : order){
+ if(null != m.get("travelTime_")){
+ String travelTime_ = m.get("travelTime_").toString();
+ m.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != m.get("travelTime")){
+ String travelTime = m.get("travelTime").toString();
+ m.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ }
+ if(null != m.get("arriveTime")){
+ String arriveTime = m.get("arriveTime").toString();
+ m.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
num += Integer.valueOf(m.get("peopleNumber").toString());
totalMoney += Double.valueOf(m.get("payMoney").toString());
List<Income> incomes = incomeService.queryData(1, null, 2, Integer.valueOf(m.get("orderId").toString()), 3);
@@ -293,8 +313,17 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderCrossCityInfo(Integer orderId) throws Exception {
- return orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
+ public Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != map.get("arriveTime")){
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
+ return map;
}
--
Gitblit v1.7.1