From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 8d0da57..3024cc9 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
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.transfer.controller;
+import com.aliyuncs.utils.StringUtils;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.TOpenCitySiteMapper;
import com.stylefeng.guns.modular.system.model.OpenCity;
@@ -172,11 +174,16 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil site(double latitude, double longitude) throws Exception {
+ public ResultUtil site(double latitude, double longitude,String code) throws Exception {
//获取当前城市名称
String cityName = AmapGeocoding.getCityName(latitude, longitude);
+
+ Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag", 3);
+ if (!StringUtils.isEmpty(code)){
+ ne.eq("code",code);
+ }
//查询ids
- List<OpenCity> cityName1 = openCityService.selectList(new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag",3));
+ List<OpenCity> cityName1 = openCityService.selectList(ne);
List<Integer> ids = new ArrayList<>();
for (OpenCity openCity : cityName1) {
ids.add(openCity.getId());
@@ -190,6 +197,9 @@
List<TOpenCitySite> dongche = new ArrayList<>();
for (TOpenCitySite tOpenCitySite : tOpenCitySites) {
+
+ String address = AmapGeocoding.getAddress(latitude, longitude);
+ tOpenCitySite.setAddress(address);
if (tOpenCitySite.getType()==1){
jichang.add(tOpenCitySite);
}
--
Gitblit v1.7.1