From 44e87d7d9ba5850eb50f837903a0966b518335be Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 十月 2024 18:44:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 334 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 212 insertions(+), 122 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 255fcd7..64bd2dd 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
@@ -435,7 +435,7 @@
*/
@RequestMapping(value = "/water/getCount")
@ResponseBody
- public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
+ public Object getCount1(Integer time,String insertTime,Integer payType,Integer type,String code) {
if (payType!=null){
switch (payType){
case 1:
@@ -507,10 +507,12 @@
// 用户小件物流订单记录
List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
+ // 用户取消订单记录
+ List<OrderCancel> orderCancels = new ArrayList<>();
// 用户充值
List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
// 司机结算总额
- List<SettlementDetail> settlementDetails1 = new ArrayList<>();
+ List<SettlementDetail> settlementDetails1 = new ArrayList<>();
// 司机提现
List<TPubWithdrawal> driver = new ArrayList<>();
// 用户提现
@@ -525,12 +527,10 @@
EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
// 用户小件物流订单wrapper
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
- // 司机手动结算金额
- Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
// 用户取消订单wrapper
Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
- // 用户取消订单记录
- List<OrderCancel> orderCancels = new ArrayList<>();
+ // 司机手动结算金额
+ Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
List<Integer> integers = new ArrayList<>();
integers.add(1);
integers.add(2);
@@ -539,12 +539,12 @@
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
.eq("orderType", 5)
- ;
+ ;
// 用户提现wrapper
userWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 1)
- ;
+ ;
// 司机提现wrapper
between = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
@@ -559,11 +559,12 @@
.in("payType",Arrays.asList(1, 2));
// 司机手动结算金额
orderType1 = new EntityWrapper<SettlementDetail>()
+ .isNotNull("settlementRecordId")
.in("orderType", Arrays.asList(1, 4));
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
- .eq("userType", 1).in("payType",integers)
- ;
+ .in("payType",integers)
+ .eq("userType", 1);
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -580,7 +581,8 @@
.eq("userType", 2)
.between("handleTime", start, end);
// 司机手动结算金额
- orderType1 = new EntityWrapper<SettlementDetail>()
+ orderType1 = new EntityWrapper<SettlementDetail>()
+ .isNotNull("settlementRecordId")
.in("orderType", Arrays.asList(1, 4))
.between("createTime", start, end);
// 用户专车订单wrapper
@@ -599,15 +601,15 @@
.in("payType",integers)
.between("insertTime", start, end);
}
+
+
if (type != null){
switch (type){
case 1:
// 只查询用户订单
tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
- // 用户取消订单费用
- orderCancelEntityWrapper.eq("state", 2)
- .eq("userType", 1);
+ orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
break;
case 2:
// 只查询用户充值
@@ -627,16 +629,23 @@
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);
+ orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
+
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
// 只查询司机手动结算的
settlementDetails1 = settlementDetailService.selectList(orderType1);
driver = pubWithdrawalService.selectList(between);
user = pubWithdrawalService.selectList(userWrapper);
- orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
-
}
List<WaterVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -650,6 +659,7 @@
BigDecimal driverWithdrawal = new BigDecimal("0");
// 用户提现金额
BigDecimal userWithdrawal = new BigDecimal("0");
+ // 用户订单消费
// 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
@@ -671,13 +681,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 +694,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 +709,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,14 +727,14 @@
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) {
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,12 +745,15 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO.setPayType("手机支付");
break;
case 2:
waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
// 专车
@@ -759,9 +767,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)){
@@ -781,25 +789,32 @@
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;
}
}
// 司机提现
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()));
@@ -819,13 +834,15 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
- WaterVO waterVO = new WaterVO();
- if (tPubWithdrawal.getHandleTime()!=null){
- waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ 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());
TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
if (user2!=null){
@@ -849,6 +866,10 @@
// 临时数据
continue;
}
+ String code1 = paymentRecord.getCode();
+ if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
@@ -867,8 +888,12 @@
continue;
}
}
+
waterVO.setPayType("银行卡支付");
break;
+ case 3:
+ case 4:
+ continue;
}
}
@@ -896,9 +921,78 @@
switch (income.getOrderType()){
case 1:
SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
- if (settlementRecord!=null){
- if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord.getPayType()!=null){
switch (settlementRecord.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ case 4:
+ continue;
+ }
+
+ }
+ }else{
+ continue;
+ }
+ // 查询订单信息
+ 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());
+ TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ if (tDriver != null){
+ platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
+ platformVO.setPhone(tDriver.getPhone());
+ }
+ platformVO.setRemark(tOrderPrivateCar.getRemark());
+ if (income.getCreateTime()!=null){
+ platformVO.setInsertTime(format.format(income.getCreateTime()));
+ }
+ platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
+ if (income.getPrice() != null){
+ String string = income.getPrice().toString();
+ BigDecimal bigDecimal1 = new BigDecimal(string);
+ platformVO.setMoney(bigDecimal1+"");
+ }else{
+ continue;
+ }
+
+ if (tOrderPrivateCar.getPayType() == null){
+ continue;
+ }
+
+ // 专车订单
+ String string4 = tOrderPrivateCar.getOrderMoney().toString();
+ balance = balance.add(new BigDecimal(string4));
+ res.add(platformVO);
+ break;
+ case 4:
+ // 小件物流
+ // 查询订单信息
+ SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
+ if (settlementRecord1!=null){
+ if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
+ switch (settlementRecord1.getPayType()){
case 1:
if (payType!=null){
if (payType != 1){
@@ -926,74 +1020,34 @@
}else{
continue;
}
- // 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
- if (tOrderPrivateCar==null){
- continue;
- }
- platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
- if (tDriver != null){
- platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
- platformVO.setPhone(tDriver.getPhone());
- }
- platformVO.setRemark(tOrderPrivateCar.getRemark());
- if (income.getCreateTime()!=null){
- platformVO.setInsertTime(format.format(income.getCreateTime()));
- }
- platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- if (income.getOrderMoney() != null){
- String string = income.getPrice().toString();
- BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1+"");
- }else{
- continue;
- }
-
- if (tOrderPrivateCar.getPayType() == null){
- continue;
- }
-
-
- // 专车订单
- String string4 = income.getPrice().toString();
- balance = balance.add(new BigDecimal(string4));
- res.add(platformVO);
- break;
- case 4:
- SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
- if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
- if (settlementRecord1.getPayType()!=null){
- switch (settlementRecord1.getPayType()){
- case 1:
- if (payType!=null){
- if (payType != 1){
- continue;
- }
- }
- platformVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType != 2){
- continue;
- }
- }
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- case 4:
- continue;
- }
-
- }
- }else {
- continue;
- }
- // 小件物流
- // 查询订单信息
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
if (tOrderLogistics1==null){
+ continue;
+ }
+ switch (tOrderLogistics1.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+
+ case 4:
+ continue;
+ }
+ String code2 = tOrderLogistics1.getOrderNum();
+ if(ToolUtil.isNotEmpty(code) && !code2.contains(code)){
continue;
}
platformVO.setCode(tOrderLogistics1.getOrderNum());
@@ -1002,8 +1056,9 @@
platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setPhone(tDriver1.getPhone());
}
+
platformVO.setRemark(tOrderLogistics1.getRemark());
- platformVO.setMoney(new BigDecimal(income.getPrice())+"");
+ platformVO.setMoney(BigDecimal.valueOf(income.getPrice())+"");
if (income.getCreateTime()!=null){
platformVO.setInsertTime(format.format(income.getCreateTime()));
}
@@ -1012,7 +1067,7 @@
continue;
}
- String string1 = income.getPrice().toString();
+ String string1 = tOrderLogistics1.getOrderMoney().toString();
// 小件物流订单
balance = balance.add(new BigDecimal(string1));
res.add(platformVO);
@@ -1048,7 +1103,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,15 +1297,23 @@
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);
+ orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
+
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
// 只查询司机手动结算的
settlementDetails1 = settlementDetailService.selectList(orderType1);
driver = pubWithdrawalService.selectList(between);
user = pubWithdrawalService.selectList(userWrapper);
- orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
}
List<WaterVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1266,12 +1329,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("用户订单消费");
@@ -1284,9 +1349,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());
@@ -1297,7 +1362,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){
@@ -1312,7 +1377,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());
@@ -1331,7 +1395,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) {
@@ -1349,12 +1413,15 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
+ switch (orderCancel.getPayType()){
case 1:
waterVO.setPayType("手机支付");
break;
case 2:
waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
break;
}
// 专车
@@ -1368,9 +1435,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)){
@@ -1390,25 +1457,32 @@
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;
}
}
// 司机提现
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()));
@@ -1428,8 +1502,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()));
@@ -1454,6 +1532,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()));
@@ -1538,6 +1620,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());
@@ -1628,6 +1714,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