From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
index 3024cc9..b84e0e9 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
@@ -74,7 +74,7 @@
@ApiImplicitParam(value = "出行时间（2020-08-20 10:10）", name = "travelTime", required = true, dataType = "string"),
@ApiImplicitParam(value = "是否预约（1=否，2=是）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "是否代下单（0=否，1=是）", name = "substitute", required = true, dataType = "int"),
- @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
@ApiImplicitParam(value = "下单地点纬度", name = "placementLat", required = true, dataType = "string"),
@ApiImplicitParam(value = "起点经度", name = "startLon", required = true, dataType = "string"),
@ApiImplicitParam(value = "起点纬度", name = "startLat", required = true, dataType = "string"),
@@ -176,9 +176,9 @@
})
public ResultUtil site(double latitude, double longitude,String code) throws Exception {
//获取当前城市名称
- String cityName = AmapGeocoding.getCityName(latitude, longitude);
+// String cityName = AmapGeocoding.getCityName(latitude, longitude);
- Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag", 3);
+ Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().ne("flag", 3);
if (!StringUtils.isEmpty(code)){
ne.eq("code",code);
}
@@ -198,7 +198,7 @@
for (TOpenCitySite tOpenCitySite : tOpenCitySites) {
- String address = AmapGeocoding.getAddress(latitude, longitude);
+ String address = AmapGeocoding.getAddress(Double.parseDouble(tOpenCitySite.getLat()), Double.parseDouble(tOpenCitySite.getLon()));
tOpenCitySite.setAddress(address);
if (tOpenCitySite.getType()==1){
jichang.add(tOpenCitySite);
--
Gitblit v1.7.1