From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 22 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index a4f7c6f..3fba8f0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -2,13 +2,22 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
+import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
+import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+import com.stylefeng.guns.modular.system.model.Car;
+import com.stylefeng.guns.modular.system.model.UserInfo;
+import com.stylefeng.guns.modular.system.service.ICarService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
+import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -21,6 +30,8 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.Map;
@@ -51,6 +62,12 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
+ @Autowired
+ private ICarService carService;
+
+ @Resource
+ private RedisUtil redisUtil;
+
/**
* 获取预计行驶时间
@@ -62,11 +79,12 @@
* @throws Exception
*/
@Override
- public ResultUtil<BaseWarpper> queryExpectedTime(Double slon, Double slat, Double elon, Double elat) throws Exception {
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(slon + "," + slat, elon + "," + elat, 1);
- int duration = Integer.valueOf(distance.get("duration")) / 60;
+ public ResultUtil<BaseWarpper> queryExpectedTime(Integer uid, Double slon, Double slat, Double elon, Double elat) throws Exception {
+ String tripId = redisUtil.getValue("trip" + uid);
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(slat, slon, elat, elon, tripId);
+ Long duration = distancematrix.getDuration() / 60;
BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setMinute(duration);
+ baseWarpper.setMinute(duration.intValue());
return ResultUtil.success(baseWarpper);
}
@@ -79,30 +97,30 @@
* @throws Exception
*/
@Override
- public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content) throws Exception {
+ public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content, Integer language) throws Exception {
JSONObject jsonObject = JSON.parseObject(content);
switch (type){
case 1://订单完成支付
- switch (orderType){
- case 1:
- return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 2:
- return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 3:
- return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 4:
- return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
- case 5:
- return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
- }
+// switch (orderType){
+// case 1:
+// return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3, 1);
+// case 2:
+// return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
+// case 3:
+// return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
+// case 4:
+// return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
+// case 5:
+// return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
+// }
case 2://订单取消支付
switch (orderType){
case 1:
- return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+// return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
case 2:
- return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+ return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
case 3:
- return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+ return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
}
case 3://司机端改派支付
@@ -123,14 +141,48 @@
return ResultUtil.success(jsonObject1.getString("msg"), jsonObject1.getString("data"));
case 4://余额充值
if(userType == 1){
- return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3);
+// return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3, 1);
}
if(userType == 2){
}
case 5://小件物流补差价
- return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
+// return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
}
return ResultUtil.success();
}
+
+
+ /**
+ * 获取订单车牌信息
+ * @param orderType
+ * @param orderId
+ * @return
+ */
+ @Override
+ public Map<String, Object> queryOrderLicensePlate(Integer orderType, Integer orderId) {
+ Map<String, Object> map = new HashMap<>();
+ if(orderType == 1){
+ OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
+ if(null != orderPrivateCar.getCarId()){
+ Car car = carService.selectById(orderPrivateCar.getCarId());
+ map.put("licensePlate", car.getCarLicensePlate());
+ }
+ map.put("userName", orderPrivateCar.getPassengers());
+ map.put("phone", orderPrivateCar.getPassengersPhone());
+ }
+ if(orderType == 4){
+ OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+ if(null != orderLogistics.getCarId()){
+ Car car = carService.selectById(orderLogistics.getCarId());
+ map.put("licensePlate", car.getCarLicensePlate());
+ }
+ if(null != orderLogistics.getUserId()){
+ UserInfo userInfo = userInfoService.selectById(orderLogistics.getUserId());
+ map.put("userName", ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName());
+ map.put("phone", userInfo.getPhone());
+ }
+ }
+ return map;
+ }
}
--
Gitblit v1.7.1