From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 57c6917..b4157ad 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+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.account.service.ITEnterpriseWithdrawalService;
@@ -137,14 +138,15 @@
types=2;
// return ResultUtil.error("您提交的申请正在处理中");
}
-
//获取支付金额
-// Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
-// reassign.setMoney(aDouble);
-// reassign.setOriginalDriverId(uid);
-// reassign.setOriginalCarId(driver.getCarId());
-// reassign.setInsertTime(new Date());
-// this.insert(reassign);
+ Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
+ reassign.setMoney(aDouble);
+ reassign.setOriginalDriverId(uid);
+ reassign.setOriginalCarId(driver.getCarId());
+ reassign.setInsertTime(new Date());
+ if(types==1){
+ this.insert(reassign);
+ }
// systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//开始支付
@@ -284,6 +286,7 @@
Driver driver = driverService.selectById(uid);
//修改改派通知状态
switch (reassign.getOrderType()) {
+
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
orderPrivateCar.setState(orderPrivateCar.getOldState());
@@ -322,6 +325,7 @@
OrderUtil.modifyTravelItinerary(request1);
break;
}
+ reassignMapper.delete(new EntityWrapper<Reassign>().eq("orderId",reassign.getOrderId()).eq("orderType",reassign.getOrderType()));
return ResultUtil.success();
}
--
Gitblit v1.7.1