From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 122 +++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 58 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 97dd927..2eccc49 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -67,13 +67,7 @@
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
@Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
private IOrderTaxiService orderTaxiService;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
@Resource
@@ -84,6 +78,12 @@
@Autowired
private IIncomeService incomeService;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
@Value("${filePath}")
@@ -101,8 +101,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
- return orderPrivateCarMapper.queryOrderList(state, driverId);
+ public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryOrderList(state, driverId, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
/**
@@ -113,8 +118,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderPrivateCarMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -125,8 +135,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderPrivateCarMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+ Map<String, Object> map = orderPrivateCarMapper.queryPushOrder(orderId, language);
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ return map;
}
@@ -139,7 +152,7 @@
* @throws Exception
*/
@Override
- public synchronized ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
+ public synchronized ResultUtil grabOrder(Integer orderId, Integer uid, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
//处理摆渡车的情况
if(orderPrivateCar.getType() == 2){
@@ -161,15 +174,15 @@
.eq("place", orderPrivateCar.getPlace())
);
if(list.size() > 0 || list1.size() > 0){
- return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
}
if(orderPrivateCar.getState() == 9){
- return ResultUtil.error("订单已取消");
+ return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderPrivateCar.getState() != 1){
- return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderPrivateCar.setDriverId(uid);
@@ -221,20 +234,12 @@
}
}).start();
- systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单，请及时联系客户！", orderPrivateCar.getDriverId());
- systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId());
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
- //上传数据
- pushMinistryOfTransportUtil.orderCreate(orderId);
- pushMinistryOfTransportUtil.orderMatch(orderId);
- }
- }
- }).start();
-
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单，请及时联系客户！" :
+ language == 2 ? "You have successfully grabbed a taxi order, please contact the customer in time!"
+ : "Vous avez saisi avec succès une commande de taxi, veuillez contacter le client à temps!", orderPrivateCar.getDriverId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
+ language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!"
+ : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderPrivateCar.getUserId());
return ResultUtil.success();
}
@@ -247,8 +252,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- return orderPrivateCarMapper.queryOrderInfo(orderId);
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ return map;
}
@@ -261,7 +269,7 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
// if(state==5){
// UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
@@ -270,10 +278,10 @@
// }
// }
if(state==3 && orderPrivateCar.getState()!=2){
- return ResultUtil.error("当前订单不能触发前往预约地点");
+ return ResultUtil.error(language == 1 ? "当前订单不能触发前往预约地点" : language == 2 ? "The current order cannot trigger travel to the reservation" : "La commande en cours ne peut pas déclencher une visite au lieu de rendez-vous");
}
if(state==4 && orderPrivateCar.getState()!=3){
- return ResultUtil.error("当前订单不能到达预约地点");
+ return ResultUtil.error(language == 1 ? "当前订单不能到达预约地点" : language == 2 ? "The current order cannot arrive at the reservation" : "La commande en cours ne peut pas atteindre le rendez-vous");
}
/*if(state==5 && orderPrivateCar.getState()!=4){
return ResultUtil.error("当前订单不能开始服务");
@@ -282,12 +290,12 @@
case 3://出发前往预约点
orderPrivateCar.setState(3);
orderPrivateCar.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "he driver has left, please wait patiently" : "Le chauffeur est parti, soyez patient", orderPrivateCar.getUserId());
break;
case 4://到达预约点，等待客户上车
orderPrivateCar.setState(4);
orderPrivateCar.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已到达您设置的预约地点，请及时上车", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ? "The driver has arrived at the reservation place you set, please get on the bus in time" : "Le chauffeur est arrivé au lieu de rendez-vous que vous avez fixé, s’il vous plaît embarquez à temps", orderPrivateCar.getUserId());
break;
case 5://开始服务
orderPrivateCar.setBoardingLon(lon);
@@ -299,14 +307,6 @@
pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);//主动推送司机定位
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.operateDepart(orderId);
- }
- }
- }).start();
OrderPosition orderPosition = new OrderPosition();
orderPosition.setOrderId(orderId);
orderPosition.setOrderType(1);
@@ -445,19 +445,6 @@
pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
}
}).start();
-
- OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传交通数据
- pushMinistryOfTransportUtil.baseInfoVehicleTotalMile(finalOrderPrivateCar.getCarId());
- pushMinistryOfTransportUtil.operateArrive(orderId);
- }
- }
- }).start();
-
-
return ResultUtil.success();
}
@@ -762,4 +749,23 @@
public List<OrderPrivateCar> getSmsOrderList() {
return this.baseMapper.getSmsOrderList();
}
+
+
+ @Override
+ public void payOrderPrivateCarCallback(Integer id, String order_id, Integer language) throws Exception {
+ OrderPrivateCar orderPrivateCar = this.selectById(id);
+ PaymentRecord query = paymentRecordService.query(1, orderPrivateCar.getDriverId(), 2, id, 1, null, 1);
+ if(null != query){
+ //添加交易明细
+ transactionDetailsService.saveData(orderPrivateCar.getDriverId(), language == 1 ? "现金收款代付" : language == 2 ? "Cash collection on behalf of payment" : "Paiement en espèces", query.getAmount(), 2, 1, 2, 1, id);
+ orderPrivateCar.setDriverPay(2);
+ this.updateById(orderPrivateCar);
+
+ query.setState(2);
+ query.setCode(order_id);
+ paymentRecordService.updateById(query);
+ }else{
+ System.err.println("预支付数据异常（orderId = " + id + ")");
+ }
+ }
}
--
Gitblit v1.7.1