From 59f70d9b19408d36f40ee0f418bf98232c40fb33 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 09:41:42 +0800
Subject: [PATCH] 代码调整
---
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java
index 6912f6e..4d6d71b 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java
@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.dao.*;
+import com.stylefeng.guns.modular.system.dao.LinePriceMapper;
+import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
+import com.stylefeng.guns.modular.system.dao.OrderCrossCityMapper;
+import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
@@ -90,12 +93,6 @@
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
- @Resource
- private OrderPrivateCarMapper orderPrivateCarMapper;
-
- @Resource
- private OrderTaxiMapper orderTaxiMapper;
@Value("${callbackPath}")
private String callbackPath;
@@ -321,27 +318,6 @@
userInfo.setInsertUser(uid);
userInfoService.insert(userInfo);
}
-
- /**
- * 1.出租车、专车、跨城有待支付的订单不能叫车
- * 2.小件物流有未完成的订单可以下跨城、专车、出租车
- * 3.出租车、专车、跨城有预约单可以下即时单
- */
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
- if(orderPrivateCars.size() > 0){
- return ResultUtil.error("乘客有未完成的订单");
- }
- List<OrderTaxi> list = orderTaxiMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
- if(list.size() > 0){
- return ResultUtil.error("乘客有未完成的订单");
- }
-
- List<OrderCrossCity> orderCrossCities2 = orderCrossCityMapper.queryOrders(orderCrossCityWarpper.getDriverId(), orderCrossCityWarpper.getLineShiftDriverId(), Arrays.asList(5));
- if(orderCrossCities2.size() > 0){
- return ResultUtil.error("司机正在服务中");
- }
-
-
orderCrossCity.setUserId(userInfo.getId());
orderCrossCity.setPassengers(orderCrossCityWarpper.getPassengers());
orderCrossCity.setPassengersPhone(orderCrossCityWarpper.getPassengersPhone());
@@ -387,7 +363,7 @@
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
+ Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
if(String.valueOf(map.get("code")).equals("200")){
orderCrossCity.setTelX(map.get("telX"));
orderCrossCity.setBindId(map.get("bindId"));
--
Gitblit v1.7.1