From 19d2b6427ebed89895b402d5e61ab78f4687b550 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 10 十月 2024 11:31:11 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 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..969e537 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
@@ -740,7 +740,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();
@@ -754,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)){
@@ -774,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());
@@ -1041,7 +1054,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 +1248,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);
@@ -1264,6 +1284,10 @@
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()));
@@ -1297,6 +1321,10 @@
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()));
@@ -1335,6 +1363,11 @@
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){
@@ -1342,7 +1375,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();
@@ -1363,6 +1406,10 @@
continue;
}
}
+ String orderNum1 = tOrderLogistics1.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !orderNum1.contains(code)){
+ continue;
+ }
WaterVO waterVO1 = new WaterVO();
waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
waterVO1.setType("用户订单消费");
@@ -1376,12 +1423,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());
@@ -1395,6 +1445,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 +1470,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 +1498,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 +1586,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 +1680,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