From 38470a0317c44220f371ef96a4a1b935ac16bdc0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 24 七月 2024 13:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 198 +++++++++++++++++++++++++++++--------------------
1 files changed, 116 insertions(+), 82 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 b369640..4ef08d7 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
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -176,7 +177,7 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5 && insertTime==null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -304,7 +305,7 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time == 5 && insertTime==null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
}else{
settlementDetailEntityWrapper.between("createTime", start, end);
@@ -333,21 +334,24 @@
platformVO.setMoney(bigDecimal1);
platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- if (state!=null && state!=1){
- continue;
- }
- // 已结算
- platformVO.setState(1);
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
- }else{
- if (state!=null && state!=2){
- continue;
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
+ continue;
+ }
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
@@ -372,21 +376,24 @@
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- if (state!=null && state!=1){
- continue;
- }
- // 已结算
- platformVO.setState(1);
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
- }else{
- if (state!=null && state!=2){
- continue;
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
+ continue;
+ }
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -414,6 +421,16 @@
@RequestMapping(value = "/water/getCount")
@ResponseBody
public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
+ if (payType!=null){
+ switch (payType){
+ case 1:
+ payType = 2;
+ break;
+ case 2:
+ payType = 1;
+ break;
+ }
+ }
if (time == null){
time = 1;
}
@@ -495,7 +512,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time == 5 && insertTime==null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -679,7 +696,7 @@
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -700,7 +717,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -772,11 +789,11 @@
case 1:
SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
if (settlementRecord!=null){
- if (settlementRecord.getPayType()!=null){
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
switch (settlementRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -784,7 +801,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -795,6 +812,8 @@
continue;
}
+ }else{
+ continue;
}
}else{
continue;
@@ -835,12 +854,12 @@
break;
case 4:
SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
- if (settlementRecord1==null){
+ if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
if (settlementRecord1.getPayType()!=null){
switch (settlementRecord1.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -848,7 +867,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -860,6 +879,8 @@
}
}
+ }else {
+ continue;
}
// 小件物流
// 查询订单信息
@@ -916,6 +937,16 @@
@RequestMapping(value = "/water/list")
@ResponseBody
public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
+ if (payType!=null){
+ switch (payType){
+ case 1:
+ payType = 2;
+ break;
+ case 2:
+ payType = 1;
+ break;
+ }
+ }
if (time == null){
time = 1;
}
@@ -997,7 +1028,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time == 5 && insertTime==null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -1112,7 +1143,6 @@
continue;
}
}
-
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
@@ -1181,7 +1211,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1202,7 +1232,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1271,19 +1301,18 @@
userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
}
// 查询所有已结算的订单
- // 查询所有已结算的订单
for (SettlementDetail income : settlementDetails1) {
WaterVO platformVO = new WaterVO();
platformVO.setType("司机结算");
switch (income.getOrderType()){
case 1:
SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
- if (settlementRecord!=null){
+ if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
if (settlementRecord.getPayType()!=null){
switch (settlementRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1291,7 +1320,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1343,12 +1372,12 @@
// 小件物流
// 查询订单信息
SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
- if (settlementRecord1==null){
- if (settlementRecord1.getPayType()!=null){
+ if (settlementRecord1!=null){
+ if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
switch (settlementRecord1.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1356,7 +1385,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1367,7 +1396,11 @@
continue;
}
+ }else{
+ continue;
}
+ }else{
+ continue;
}
TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
if (tOrderLogistics1==null){
@@ -1500,7 +1533,8 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5 && insertTime==null){
+
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -1516,7 +1550,7 @@
}
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time == 5 && insertTime==null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
}else{
settlementDetailEntityWrapper.between("createTime", start, end);
@@ -1623,7 +1657,6 @@
break;
}
}
-
// 查询所有现金支付的订单
for (SettlementDetail settlementDetail : settlementDetails) {
PlatformVO platformVO = new PlatformVO();
@@ -1640,33 +1673,31 @@
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
-
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
String string = settlementDetail.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
platformVO.setPayType("现金支付");
-
if (settlementDetail.getSettlementRecordId()!=null){
- if (state!=null && state!=1){
- continue;
- }
- // 已结算
- platformVO.setState(1);
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
- }else{
- if (state!=null && state!=2){
- continue;
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
+ continue;
+ }
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
-
res.add(platformVO);
break;
case 4:
@@ -1689,21 +1720,24 @@
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- if (state!=null && state!=1){
- continue;
- }
- // 已结算
- platformVO.setState(1);
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
- }else{
- if (state!=null && state!=2){
- continue;
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
+ continue;
+ }
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
--
Gitblit v1.7.1