From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index cdf1dd7..05bf746 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -486,7 +486,8 @@
System.err.println("预支付数据异常（orderId = " + id + ")");
}
}
-
+ @Resource
+ private DriverWorkMapper driverWorkMapper;
/**
* 跨城下单操作
@@ -539,6 +540,13 @@
if(driver.getState() == 1){
return ResultUtil.error("司机处于离线状态");
}
+ DriverWork driverWork = driverWorkMapper.queryNewWork(driver.getId(), null, 1);
+ if (!driverWork.getType().contains("3")){
+ return ResultUtil.error("司机暂未开通跨城服务");
+ }
+
+
+
OrderCrossCity orderCrossCity = new OrderCrossCity();
orderCrossCity.setUserId(uid);
orderCrossCity.setServerCarModelId(orderCrossCityWarpper.getServerCarModelId());
@@ -933,7 +941,7 @@
String[] split = seatNumber.split(",");
boolean b = false;
for(String s : split){
- if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))){
+ if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("7"))){
b = true;
break;
}
@@ -1265,7 +1273,7 @@
userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney());
userInfoService.updateById(userInfo);
//添加交易明细
- transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车订单取消退款", orderCrossCity.getPayMoney(), 1, 1, 1, 3, id);
+ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney(), 1, 1, 1, 3, id);
}else{
PaymentRecord query = paymentRecordService.query(1, orderCrossCity.getUserId(), 1, id, 3, orderCrossCity.getPayType(), 2);
if(null == query){
@@ -1281,14 +1289,14 @@
return ResultUtil.error(map.get("return_msg"));
}
//添加交易明细
- transactionDetailsService.saveData(query.getUserId(), "直通车订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
+ transactionDetailsService.saveData(query.getUserId(), "跨城订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
}else{//支付宝
Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
if(!"10000".equals(map.get("code"))){
return ResultUtil.error(map.get("msg"));
}
//添加交易明细
- transactionDetailsService.saveData(query.getUserId(), "直通车订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
+ transactionDetailsService.saveData(query.getUserId(), "跨城订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
}
--
Gitblit v1.7.1