From aba1baff88d0a04a39523177d20a91ba88aeb7eb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:23 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 084c83d..255fcd7 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
@@ -603,7 +603,7 @@
switch (type){
case 1:
// 只查询用户订单
- tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
@@ -674,9 +674,9 @@
if (tOrderPrivateCar != null){
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = tOrderPrivateCar.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
}else{
- waterVO.setMoney(new BigDecimal("0"));
+ waterVO.setMoney(new BigDecimal("0")+"");
}
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
@@ -702,8 +702,8 @@
// 小件物流
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- waterVO.setMoney(new BigDecimal("0"));
+ waterVO.setMoney(new BigDecimal(string)+"");
+ waterVO.setMoney(new BigDecimal("0")+"");
TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
@@ -751,7 +751,7 @@
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -774,7 +774,7 @@
// 小件物流
waterVO1.setCode(tOrderLogistics1.getOrderNum());
String string1 = orderCancel.getMoney().toString();
- waterVO1.setMoney(new BigDecimal(string1));
+ waterVO1.setMoney(new BigDecimal(string1)+"");
TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
if (user2!=null){
waterVO1.setName(user2.getNickName());
@@ -810,8 +810,8 @@
waterVO.setPhone(tDriver.getPhone());
}
- waterVO.setMoney(tPubWithdrawal.getMoney());
- waterVO.setPayType("银行卡支付");
+ waterVO.setMoney("-"+tPubWithdrawal.getMoney());
+ waterVO.setPayType("手机支付");
waterVO.setType("司机提现");
waterVO.setRemark(tPubWithdrawal.getRemark());
res.add(waterVO);
@@ -832,8 +832,8 @@
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
}
- waterVO.setMoney(tPubWithdrawal.getMoney());
- waterVO.setPayType("银行卡支付");
+ waterVO.setMoney("-"+tPubWithdrawal.getMoney());
+ waterVO.setPayType("手机支付");
waterVO.setType("用户提现");
waterVO.setRemark(tPubWithdrawal.getRemark());
res.add(waterVO);
@@ -872,7 +872,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -945,7 +945,7 @@
if (income.getOrderMoney() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1003,7 +1003,7 @@
platformVO.setPhone(tDriver1.getPhone());
}
platformVO.setRemark(tOrderLogistics1.getRemark());
- platformVO.setMoney(new BigDecimal(income.getPrice()));
+ platformVO.setMoney(new BigDecimal(income.getPrice())+"");
if (income.getCreateTime()!=null){
platformVO.setInsertTime(format.format(income.getCreateTime()));
}
@@ -1286,7 +1286,7 @@
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = tOrderPrivateCar.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -1311,8 +1311,8 @@
// 小件物流
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- waterVO.setMoney(new BigDecimal("0"));
+ waterVO.setMoney(new BigDecimal(string)+"");
+ waterVO.setMoney(new BigDecimal("0")+"");
TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
@@ -1338,7 +1338,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;
}
@@ -1360,7 +1360,7 @@
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -1383,7 +1383,7 @@
// 小件物流
waterVO1.setCode(tOrderLogistics1.getOrderNum());
String string1 = orderCancel.getMoney().toString();
- waterVO1.setMoney(new BigDecimal(string1));
+ waterVO1.setMoney(new BigDecimal(string1)+"");
TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
if (user2!=null){
waterVO1.setName(user2.getNickName());
@@ -1419,8 +1419,8 @@
waterVO.setPhone(tDriver.getPhone());
}
- waterVO.setMoney(tPubWithdrawal.getMoney());
- waterVO.setPayType("银行卡支付");
+ waterVO.setMoney("-"+tPubWithdrawal.getMoney());
+ waterVO.setPayType("手机支付");
waterVO.setType("司机提现");
waterVO.setRemark(tPubWithdrawal.getRemark());
res.add(waterVO);
@@ -1439,8 +1439,8 @@
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
}
- waterVO.setMoney(tPubWithdrawal.getMoney());
- waterVO.setPayType("银行卡支付");
+ waterVO.setMoney("-"+tPubWithdrawal.getMoney());
+ waterVO.setPayType("手机支付");
waterVO.setType("用户提现");
waterVO.setRemark(tPubWithdrawal.getRemark());
res.add(waterVO);
@@ -1483,7 +1483,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -1554,7 +1554,7 @@
if (income.getPrice() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1636,7 +1636,7 @@
}
platformVO.setRemark(tOrderLogistics1.getRemark());
- platformVO.setMoney(BigDecimal.valueOf(income.getPrice()));
+ platformVO.setMoney(BigDecimal.valueOf(income.getPrice())+"");
if (income.getCreateTime()!=null){
platformVO.setInsertTime(format.format(income.getCreateTime()));
}
--
Gitblit v1.7.1