From fa0a4b0ac2c4eaf2d289983ae117488ad80511cb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 十月 2024 18:44:24 +0800
Subject: [PATCH] 修改2.0 bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 26 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 6182e87..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) {
@@ -740,7 +735,17 @@
continue;
}
}
- waterVO.setPayType("手机支付");
+ switch (orderCancel.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
+ break;
+ }
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -752,9 +757,9 @@
}
waterVO.setRemark(tOrderPrivateCar.getRemark());
res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
break;
- case 2:
+ case 4:
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
if (payType!=null){
if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -774,18 +779,21 @@
waterVO1.setPhone(user2.getPhone());
}
waterVO1.setType("用户订单消费");
- switch (tOrderLogistics1.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO1.setPayType("手机支付");
break;
case 2:
waterVO1.setPayType("银行卡支付");
break;
+ case 3:
+ 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;
}
}
@@ -1041,7 +1049,7 @@
private IOrderCancelService orderCancelService;
@RequestMapping(value = "/water/list")
@ResponseBody
- public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
+ public Object list1(Integer time,String insertTime,Integer payType,Integer type, String code) {
if (payType!=null){
switch (payType){
case 1:
@@ -1235,6 +1243,13 @@
break;
}
}else{
+ if(ToolUtil.isNotEmpty(code)){
+ tOrderPrivateCarEntityWrapper.like("orderNum", code);
+ tOrderLogisticsEntityWrapper.like("orderNum", code);
+ orderType.like("", code);
+ }
+
+
// 只查询用户订单
tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
@@ -1259,12 +1274,14 @@
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
+ // 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (payType!=null){
if (tOrderPrivateCar.getPayType()!=payType){
continue;
}
}
+
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
@@ -1277,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());
@@ -1290,7 +1307,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){
@@ -1305,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());
@@ -1324,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) {
@@ -1342,7 +1358,17 @@
continue;
}
}
- waterVO.setPayType("手机支付");
+ switch (orderCancel.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
+ break;
+ }
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -1354,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());
@@ -1376,18 +1402,21 @@
waterVO1.setPhone(user2.getPhone());
}
waterVO1.setType("用户订单消费");
- switch (tOrderLogistics1.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO1.setPayType("手机支付");
break;
case 2:
waterVO1.setPayType("银行卡支付");
break;
+ case 3:
+ 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;
}
}
@@ -1395,6 +1424,10 @@
for (TPubWithdrawal tPubWithdrawal : driver) {
if(payType!=null && payType == 2){
break;
+ }
+ String code1 = tPubWithdrawal.getCode();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
+ continue;
}
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
@@ -1416,6 +1449,10 @@
for (TPubWithdrawal tPubWithdrawal : user) {
if(payType!=null && payType == 2){
break;
+ }
+ String code1 = tPubWithdrawal.getCode();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
+ continue;
}
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
@@ -1440,6 +1477,10 @@
if (paymentRecord!=null){
if (paymentRecord.getState() == 1){
// 临时数据
+ continue;
+ }
+ String code1 = paymentRecord.getCode();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
continue;
}
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
@@ -1524,6 +1565,10 @@
// 查询订单信息
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
if (tOrderPrivateCar==null){
+ continue;
+ }
+ String code1 = tOrderPrivateCar.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -1614,6 +1659,10 @@
case 4:
continue;
}
+ String code2 = tOrderLogistics1.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !code2.contains(code)){
+ continue;
+ }
platformVO.setCode(tOrderLogistics1.getOrderNum());
TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
if (tDriver1!=null){
--
Gitblit v1.7.1