From f88507a761ae5b8f47e52b81627ca485b500431a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 21 三月 2025 18:49:18 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 5a6fac3..8efb8a6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -665,6 +665,17 @@
public ResultUtil placeOrderPackage(String remark, String placementLon, String placementLat, String startLon, String startLat, String startAddress,
String recipient, String recipientPhone, String endLon, String endLat, String endAddress,
Integer serverCarModelId, Integer driverId, Integer orderSource, Integer uid, Integer language) throws Exception {
+
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
+ String[] split1 = placementLon.split(",");
+ Company company = companyCityService.query1(uid, split1[0], split1[1]);
+ if(null != userInfo && null != company){
+ userInfo.setCompanyId(company.getId());
+ userInfoService.updateById(userInfo);
+ }
/**
* 1.下了即时单就不能下预约单和即时单
* 2.下了预约单和再下一张即时单不能再下预约单
@@ -686,6 +697,8 @@
return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select vehicle-type" : "Veuillez sélectionner le type de véhicule");
}
+ userInfo.setLanguage(language);
+ userInfoService.updateById(userInfo);
OrderLogistics orderLogistics = new OrderLogistics();
orderLogistics.setType(4);
orderLogistics.setUserId(uid);
@@ -770,10 +783,6 @@
Long distance1 = distancematrix1.getDistance();
orderLogistics.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
this.insert(orderLogistics);
-
- UserInfo userInfo = userInfoService.selectById(uid);
- userInfo.setLanguage(language);
- userInfoService.updateById(userInfo);
//google创建车辆信息
String vehicleId = null;
--
Gitblit v1.7.1