From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 2 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 20b67fb..5ade0de 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
@@ -47,6 +47,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -198,6 +199,15 @@
@Autowired
private IUserActivityRedenvelopeService userActivityRedenvelopeService;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
+
+ @Resource
+ private CarModelMapper carModelMapper;
+
+ @Autowired
+ private ICarService carService;
@@ -681,7 +691,31 @@
orderLogistics.setIsReassign(1);
orderLogistics.setIsDelete(1);
+ orderLogistics.setTripId(UUIDUtil.getRandomCode());
this.insert(orderLogistics);
+
+
+ String vehicleId = null;
+ if(null != orderLogistics.getDriverId()){
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(driver.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carMapper.updateById(car);
+ }
+ //查询车辆信息，没有则创建信息
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }
+
+ }
+ //创建行程数据
+ fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+
if(orderSource == 2){//扫码下单
new Thread(new Runnable() {
@@ -802,6 +836,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setState(orderLogistics.getState());
baseWarpper.setId(orderLogistics.getId());
+ baseWarpper.setContent(orderLogistics.getTripId());
return ResultUtil.success(baseWarpper);
}
@@ -836,7 +871,7 @@
if(null != couponId){
//TODO 待翻译
if(null != redDeduction && 1 == redDeduction){
- return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "" : "", "");
+ return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "Coupons and lucky-promo cannot be used at the same time." : "Les coupons et les bonus ne peuvent pas être utilisés en même temps", "");
}
userCouponRecord = userCouponRecordService.selectById(couponId);
if(userCouponRecord.getCompanyId() != orderLogistics.getCompanyId()){
@@ -1100,6 +1135,13 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_chinese = document.getElementById("bcj_chinese");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
+ bcj_chinese_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1160,6 +1202,13 @@
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_english = document.getElementById("bcj_english");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_english_div = document.getElementById("bcj_english_div");
+ bcj_english_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1220,6 +1269,13 @@
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_french = document.getElementById("bcj_french");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_french_div = document.getElementById("bcj_french_div");
+ bcj_french_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1503,6 +1559,13 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_chinese = document.getElementById("bcj_chinese");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
+ bcj_chinese_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1563,6 +1626,13 @@
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_english = document.getElementById("bcj_english");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_english_div = document.getElementById("bcj_english_div");
+ bcj_english_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1623,6 +1693,13 @@
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_french = document.getElementById("bcj_french");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_french_div = document.getElementById("bcj_french_div");
+ bcj_french_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2008,6 +2085,13 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_chinese = document.getElementById("bcj_chinese");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
+ bcj_chinese_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2068,6 +2152,13 @@
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_english = document.getElementById("bcj_english");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_english_div = document.getElementById("bcj_english_div");
+ bcj_english_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2128,6 +2219,13 @@
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element bcj_french = document.getElementById("bcj_french");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_french_div = document.getElementById("bcj_french_div");
+ bcj_french_div.remove();
+ }
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2469,7 +2567,10 @@
driver.setState(2);
driverService.updateById(driver);
}
-
+
+ //修改行程信息
+ fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
+
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the delivery order successfully, thank you for using I-GO "
: "Vous avez annulé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
--
Gitblit v1.7.1