From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 9c9d85f..864e3c8 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -85,7 +85,8 @@
private String callbackPath;
-
+ @Autowired
+ private ITOrderTransferService orderTransferService;
/**
* 提交改派申请
* @param uid 申请司机id
@@ -207,6 +208,17 @@
//添加已收入明细
incomeService.saveData(1, orderLogistics1.getCompanyId(), 4, orderLogistics1.getId(), orderLogistics1.getType(), reassign.getMoney());
+ break;
+
+ case 7:
+ TOrderTransfer orderTransfer = orderTransferService.selectById(reassign.getOrderId());
+ orderTransfer.setOldState(orderTransfer.getState());
+ orderTransfer.setState(11);
+ orderTransfer.setReassignNotice(2);
+ orderTransferService.updateById(orderTransfer);
+
+ //添加已收入明细
+ incomeService.saveData(1, orderTransfer.getCompanyId(), 4, orderTransfer.getId(), 7, reassign.getMoney());
break;
}
@@ -447,6 +459,16 @@
//添加已收入明细
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
break;
+ case 7:
+ TOrderTransfer orderTransfer = orderTransferService.selectById(reassign.getOrderId());
+ orderTransfer.setOldState(orderTransfer.getState());
+ orderTransfer.setState(11);
+ orderTransfer.setReassignNotice(2);
+ orderTransferService.updateById(orderTransfer);
+
+ //添加已收入明细
+ incomeService.saveData(1, orderTransfer.getCompanyId(), 4, orderTransfer.getId(), 7, reassign.getMoney());
+ break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
orderTaxi.setOldState(orderTaxi.getState());
--
Gitblit v1.7.1