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 | 142 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 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 084c83d..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
@@ -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());
@@ -729,7 +729,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;
}
@@ -740,18 +740,21 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ 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();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -761,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,19 +777,22 @@
// 小件物流
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());
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());
@@ -798,7 +804,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -810,8 +816,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);
@@ -819,7 +825,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -832,8 +838,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 +878,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -945,7 +951,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 +1009,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()));
}
@@ -1048,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:
@@ -1242,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);
@@ -1272,6 +1285,10 @@
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("用户订单消费");
@@ -1286,7 +1303,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());
@@ -1305,14 +1322,18 @@
continue;
}
}
+ String orderNum = tOrderLogistic.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !orderNum.contains(code)){
+ continue;
+ }
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
waterVO.setType("用户订单消费");
// 小件物流
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,10 +1359,15 @@
WaterVO waterVO = new WaterVO();
switch (orderCancel.getOrderType()){
case 1:
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
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){
@@ -1349,18 +1375,21 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ 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();
- waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -1370,12 +1399,16 @@
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)){
continue;
}
+ }
+ String orderNum1 = tOrderLogistics1.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !orderNum1.contains(code)){
+ continue;
}
WaterVO waterVO1 = new WaterVO();
waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
@@ -1383,19 +1416,22 @@
// 小件物流
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());
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());
@@ -1407,8 +1443,12 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ 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()));
@@ -1419,8 +1459,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);
@@ -1428,8 +1468,12 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ 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()));
@@ -1439,8 +1483,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);
@@ -1454,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()));
@@ -1483,7 +1531,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -1540,6 +1588,10 @@
if (tOrderPrivateCar==null){
continue;
}
+ String code1 = tOrderPrivateCar.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
+ continue;
+ }
platformVO.setCode(tOrderPrivateCar.getOrderNum());
TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
if (tDriver != null){
@@ -1554,7 +1606,7 @@
if (income.getPrice() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1628,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){
@@ -1636,7 +1692,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