From a0adf81a3ea4b208b47a0c02021c0f7e6ac3c74e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 27 十一月 2025 15:40:27 +0800
Subject: [PATCH] update
---
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index a4e49e8..1a986a3 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -705,7 +705,10 @@
TDriver driver = itDriverService.selectById(originalDriverId);
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",driver.getId())
+ .eq("userType",2).eq("type",1).last("limit 1")
+ );
if(null == userWithdrawal){
return ResultUtil.error("该司机未进件");
}
@@ -782,7 +785,9 @@
public String createAllocationReq(Integer companyId,Integer userId,int type,double money){
List<TEnterpriseWithdrawal> tEnterpriseWithdrawals = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", companyId));
TDriver tUser = itDriverService.selectById(userId);
- List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone", tUser.getPhone()));
+ List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",tUser.getId())
+ .eq("userType",2).eq("type", 1));
if(userWithdrawals.size()==0){
return "error";
}
@@ -848,7 +853,9 @@
TDriver driver = itDriverService.selectById(originalDriverId);
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",driver.getId())
+ .eq("userType",2).eq("type",1).last("limit 1"));
if(null == userWithdrawal){
return ResultUtil.error("该司机未进件");
}
@@ -927,7 +934,9 @@
transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
}else{
TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",driver.getId())
+ .eq("userType",2).eq("type",1).last("limit 1"));
if(null == userWithdrawal){
return ResultUtil.error("该司机未进件");
}
@@ -1034,7 +1043,9 @@
TDriver driver = itDriverService.selectById(originalDriverId);
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",driver.getId())
+ .eq("userType",2).eq("type",1).last("limit 1"));
if(null == userWithdrawal){
return ResultUtil.error("该司机未进件");
}
@@ -1180,7 +1191,9 @@
TDriver driver = itDriverService.selectById(originalDriverId);
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
+ .eq("userId",driver.getId())
+ .eq("userType",2).eq("type",1).last("limit 1"));
if(null == userWithdrawal){
return ResultUtil.error("该司机未进件");
}
--
Gitblit v1.7.1