From 3814e08bda76c5654ddcdc4778724b69dda26211 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 九月 2025 17:29:56 +0800
Subject: [PATCH] 跨城修改
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 4 +++-
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 1f6387d..0b10a29 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -52,6 +52,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
import static com.stylefeng.guns.modular.taxi.service.impl.OrderTaxiServiceImpl.orderIds;
@@ -589,7 +590,8 @@
orderCrossCity.setSort(orderCrossCities.size() + 1);
orderCrossCity.setState(7);//待支付
orderCrossCity.setInsertTime(new Date());
- orderCrossCity.setTravelTime(orderCrossCityWarpper.getTravelTime());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ orderCrossCity.setTravelTime(format.parse(orderCrossCityWarpper.getTravelTime()));
orderCrossCity.setSnatchOrderTime(new Date());
orderCrossCity.setTravelMode(orderCrossCityWarpper.getTravelMode());
orderCrossCity.setOrderSource(orderCrossCityWarpper.getOrderSource());
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java
index 91ffabf..9e541c1 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "终点详细地址", required = true, dataType = "string")
private String endAddress;
@ApiModelProperty(value = "出行时间(2020-09-04 12:00:00)", required = true, dataType = "string")
- private Date travelTime;
+ private String travelTime;
@ApiModelProperty(value = "出行方式（1=拼车，2=包车）", required = true, dataType = "int")
private Integer travelMode;
@ApiModelProperty(value = "订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)", required = true, dataType = "int")
@@ -167,11 +167,11 @@
this.endAddress = endAddress;
}
- public Date getTravelTime() {
+ public String getTravelTime() {
return travelTime;
}
- public void setTravelTime(Date travelTime) {
+ public void setTravelTime(String travelTime) {
this.travelTime = travelTime;
}
--
Gitblit v1.7.1