From 3ba2f6627d4f779d577481f87033bd6a77a3033f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 09 十月 2024 11:25:02 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 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 969e537..c0f4771 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
@@ -671,13 +671,9 @@
break;
}
// 专车
- if (tOrderPrivateCar != null){
- waterVO.setCode(tOrderPrivateCar.getOrderNum());
- String string = tOrderPrivateCar.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string)+"");
- }else{
- waterVO.setMoney(new BigDecimal("0")+"");
- }
+ waterVO.setCode(tOrderPrivateCar.getOrderNum());
+ String string = tOrderPrivateCar.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -688,7 +684,7 @@
waterVO.setRemark(tOrderPrivateCar.getRemark());
}
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
}
for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
if (payType!=null){
@@ -703,7 +699,6 @@
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- waterVO.setMoney(new BigDecimal("0")+"");
TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
@@ -722,7 +717,7 @@
waterVO.setRemark(tOrderLogistic.getRemark());
}
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
break;
}
for (OrderCancel orderCancel : orderCancels) {
@@ -762,7 +757,7 @@
}
waterVO.setRemark(tOrderPrivateCar.getRemark());
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
break;
case 4:
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
@@ -786,19 +781,19 @@
waterVO1.setType("用户订单消费");
switch (orderCancel.getPayType()){
case 1:
- waterVO.setPayType("手机支付");
+ waterVO1.setPayType("手机支付");
break;
case 2:
- waterVO.setPayType("银行卡支付");
+ waterVO1.setPayType("银行卡支付");
break;
case 3:
- waterVO.setPayType("余额支付");
+ waterVO1.setPayType("余额支付");
break;
}
waterVO1.setRemark(tOrderLogistics1.getRemark());
res.add(waterVO1);
- userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO1.getMoney()));
break;
}
}
@@ -1279,16 +1274,14 @@
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
+ // 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (payType!=null){
if (tOrderPrivateCar.getPayType()!=payType){
continue;
}
}
- String orderNum = tOrderPrivateCar.getOrderNum();
- if(ToolUtil.isNotEmpty(code) && !orderNum.contains(code)){
- continue;
- }
+
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
@@ -1301,9 +1294,9 @@
break;
}
// 专车
- waterVO.setCode(tOrderPrivateCar.getOrderNum());
- String string = tOrderPrivateCar.getPayMoney().toString();
- waterVO.setMoney(new BigDecimal(string)+"");
+ waterVO.setCode(tOrderPrivateCar.getOrderNum());
+ String string = tOrderPrivateCar.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -1314,17 +1307,13 @@
waterVO.setRemark(tOrderPrivateCar.getRemark());
}
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
}
for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
if (payType!=null){
if (tOrderLogistic.getPayType()!=payType){
continue;
}
- }
- String orderNum = tOrderLogistic.getOrderNum();
- if(ToolUtil.isNotEmpty(code) && !orderNum.contains(code)){
- continue;
}
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
@@ -1333,7 +1322,6 @@
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- waterVO.setMoney(new BigDecimal("0")+"");
TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
@@ -1352,7 +1340,7 @@
waterVO.setRemark(tOrderLogistic.getRemark());
}
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
break;
}
for (OrderCancel orderCancel : orderCancels) {
@@ -1363,11 +1351,6 @@
if (tOrderPrivateCar == null){
continue;
}
- String orderNum = tOrderPrivateCar.getOrderNum();
- if(ToolUtil.isNotEmpty(code) && !orderNum.contains(code)){
- continue;
- }
-
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
if (payType!=null){
@@ -1397,7 +1380,7 @@
}
waterVO.setRemark(tOrderPrivateCar.getRemark());
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
break;
case 4:
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
@@ -1405,10 +1388,6 @@
if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
continue;
}
- }
- String orderNum1 = tOrderLogistics1.getOrderNum();
- if(ToolUtil.isNotEmpty(code) && !orderNum1.contains(code)){
- continue;
}
WaterVO waterVO1 = new WaterVO();
waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
@@ -1425,19 +1404,19 @@
waterVO1.setType("用户订单消费");
switch (orderCancel.getPayType()){
case 1:
- waterVO.setPayType("手机支付");
+ waterVO1.setPayType("手机支付");
break;
case 2:
- waterVO.setPayType("银行卡支付");
+ waterVO1.setPayType("银行卡支付");
break;
case 3:
- waterVO.setPayType("余额支付");
+ waterVO1.setPayType("余额支付");
break;
}
waterVO1.setRemark(tOrderLogistics1.getRemark());
res.add(waterVO1);
- userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO1.getMoney()));
break;
}
}
--
Gitblit v1.7.1