From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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..d924c2c 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,12 +740,15 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO.setPayType("手机支付");
break;
case 2:
waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
// 专车
@@ -761,7 +764,7 @@
res.add(waterVO);
userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
break;
- case 2:
+ case 4:
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
if (payType!=null){
if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -781,12 +784,15 @@
waterVO1.setPhone(user2.getPhone());
}
waterVO1.setType("用户订单消费");
- switch (tOrderLogistics1.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
- waterVO1.setPayType("手机支付");
+ waterVO.setPayType("手机支付");
break;
case 2:
- waterVO1.setPayType("银行卡支付");
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
waterVO1.setRemark(tOrderLogistics1.getRemark());
@@ -798,7 +804,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -819,7 +825,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1349,12 +1355,15 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO.setPayType("手机支付");
break;
case 2:
waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
// 专车
@@ -1370,7 +1379,7 @@
res.add(waterVO);
userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
break;
- case 2:
+ case 4:
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
if (payType!=null){
if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -1390,12 +1399,15 @@
waterVO1.setPhone(user2.getPhone());
}
waterVO1.setType("用户订单消费");
- switch (tOrderLogistics1.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
- waterVO1.setPayType("手机支付");
+ waterVO.setPayType("手机支付");
break;
case 2:
- waterVO1.setPayType("银行卡支付");
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
waterVO1.setRemark(tOrderLogistics1.getRemark());
@@ -1407,7 +1419,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1428,7 +1440,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
--
Gitblit v1.7.1