From 18682d02e25400290d98d1c1f223c9724c7a98ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 15:10:53 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index 255fcd7..bac4379 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -729,7 +729,7 @@
WaterVO waterVO = new WaterVO();
switch (orderCancel.getOrderType()){
case 1:
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
if (tOrderPrivateCar == null){
continue;
}
@@ -740,14 +740,7 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- waterVO.setPayType("手机支付");
- break;
- case 2:
- waterVO.setPayType("银行卡支付");
- break;
- }
+ waterVO.setPayType("手机支付");
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -798,7 +791,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -819,7 +812,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1349,14 +1342,7 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- waterVO.setPayType("手机支付");
- break;
- case 2:
- waterVO.setPayType("银行卡支付");
- break;
- }
+ waterVO.setPayType("手机支付");
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -1407,7 +1393,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1428,7 +1414,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
--
Gitblit v1.7.1