From 6c741ac9e80353ca42906c1c6c7109324ae9f9f9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 十月 2024 01:02:38 +0800
Subject: [PATCH] 修改bug和翻译
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 d924c2c..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
@@ -1054,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:
@@ -1248,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);
@@ -1277,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()));
@@ -1310,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()));
@@ -1348,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){
@@ -1386,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("用户订单消费");
@@ -1422,6 +1446,10 @@
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()));
waterVO.setCode(tPubWithdrawal.getCode());
@@ -1442,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()));
@@ -1466,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()));
@@ -1550,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());
@@ -1640,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