From 3ca8fe373c982ae0cfeef9301fc839f8875bea2e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 23 五月 2023 00:46:07 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 1e54420..ca9e7bb 100644
--- a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -158,16 +158,26 @@
if(null != appUser){
order.setUserId(appUser.getId());
}
+ String startAddress = addOrderWarpper.getStartAddress();
+ startAddress = startAddress.replaceAll("& #40;", "(");
+ startAddress = startAddress.replaceAll("& #41;", ")");
order.setUserName(addOrderWarpper.getUserName());
order.setUserPhone(addOrderWarpper.getPhone());
order.setAgentId(driver.getAgentId());
order.setBranchOfficeId(driver.getBranchOfficeId());
- order.setStartAddress(addOrderWarpper.getStartAddress());
+ order.setStartAddress(startAddress);
order.setStartLat(addOrderWarpper.getStartLat());
order.setStartLng(addOrderWarpper.getStartLng());
- order.setEndAddress(addOrderWarpper.getEndAddress());
- order.setEndLat(addOrderWarpper.getEndLat());
- order.setEndLng(addOrderWarpper.getEndLng());
+
+ String endAddress = addOrderWarpper.getEndAddress();
+ if(ToolUtil.isNotEmpty(endAddress)){
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ order.setEndAddress(endAddress);
+ order.setEndLat(addOrderWarpper.getEndLat());
+ order.setEndLng(addOrderWarpper.getEndLng());
+ }
+
Double d = 0D;
if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);
--
Gitblit v1.7.1