From f85ea638d98b302c590e65f00e6912d91601613c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 09 十一月 2024 15:53:53 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 279 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 204 insertions(+), 75 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 64bd2dd..37cf815 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
@@ -177,6 +177,7 @@
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
+ .between("insertTime", start, end)
.isNotNull("orderType"));
}else{
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -184,6 +185,7 @@
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
+ .between("insertTime", start, end)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
@@ -191,6 +193,7 @@
.eq("objectId",1)
.ne("type", 1)
.isNotNull("orderType")
+
.between("insertTime", start, end));
}
@@ -218,7 +221,10 @@
continue;
}
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -236,22 +242,44 @@
String string = income.getMoney().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
- if (tOrderPrivateCar.getPayType() == null){
+ if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
continue;
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- platformVO.setPayType("手机支付");
- break;
- case 2:
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- platformVO.setPayType("余额支付");
- break;
- case 4:
- platformVO.setPayType("现金支付");
- break;
+ if (tOrderPrivateCar.getState() == 10){
+ // 查询取消订单 用户支付方式
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
+ .eq("orderType", 4)
+ .eq("orderId", tOrderPrivateCar.getId()));
+ if (orderCancel!=null &&orderCancel.getPayType()!=null){
+ switch (orderCancel.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ }
+ }
+ }else{
+ if (tOrderPrivateCar.getPayType()!=null){
+ switch (tOrderPrivateCar.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ case 4:
+ platformVO.setPayType("现金支付");
+ break;
+ }
+ }
}
// 专车订单
@@ -264,7 +292,10 @@
}
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -281,22 +312,44 @@
platformVO.setEndTime(format.format(income.getInsertTime()));
}
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
- if (tOrderLogistics.getPayType() == null){
+ if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
continue;
}
- switch (tOrderLogistics.getPayType()){
- case 1:
- platformVO.setPayType("手机支付");
- break;
- case 2:
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- platformVO.setPayType("余额支付");
- break;
- case 4:
- platformVO.setPayType("现金支付");
- break;
+ if (tOrderLogistics.getState() == 10){
+ // 查询取消订单 用户支付方式
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
+ .eq("orderType", 4)
+ .eq("orderId", tOrderLogistics.getId()));
+ if (orderCancel!=null &&orderCancel.getPayType()!=null){
+ switch (orderCancel.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ }
+ }
+ }else{
+ if (tOrderLogistics.getPayType()!=null){
+ switch (tOrderLogistics.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ case 4:
+ platformVO.setPayType("现金支付");
+ break;
+ }
+ }
}
// 专车订单
@@ -307,11 +360,11 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time == 5 && !StringUtils.hasLength(insertTime)){
-
- }else{
- settlementDetailEntityWrapper.between("createTime", start, end);
+ if (state!=null && state == 2){
+ settlementDetailEntityWrapper.eq("paymentStatus", 2);
}
+ settlementDetailEntityWrapper.between("createTime", start, end);
+
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
// 查询所有现金支付的订单 再根据结算主表判断是否已结算
for (SettlementDetail settlementDetail : settlementDetails) {
@@ -320,7 +373,10 @@
case 1:
// 专车订单
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -368,7 +424,10 @@
case 4:
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -728,7 +787,6 @@
}
res.add(waterVO);
userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
- break;
}
for (OrderCancel orderCancel : orderCancels) {
WaterVO waterVO = new WaterVO();
@@ -1207,32 +1265,37 @@
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
.eq("orderType", 5)
+ .between("insertTime",start,end)
;
// 用户提现wrapper
userWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 1)
+ .between("insertTime",start,end)
;
// 司机提现wrapper
between = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
- .eq("userType", 2);
+ .eq("userType", 2).between("insertTime",start,end);
// 用户专车订单wrapper
tOrderPrivateCarEntityWrapper
.isNotNull("payMoney")
- .in("payType",Arrays.asList(1, 2));
+ .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
// 用户小件物流订单wrapper
tOrderLogisticsEntityWrapper
.isNotNull("payMoney")
- .in("payType",Arrays.asList(1, 2));
+ .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
// 司机手动结算金额
orderType1 = new EntityWrapper<SettlementDetail>()
.isNotNull("settlementRecordId")
- .in("orderType", Arrays.asList(1, 4));
+ .in("orderType", Arrays.asList(1, 4)).between("insertTime",start,end);
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
+
.in("payType",integers)
- .eq("userType", 1);
+
+ .eq("userType", 1)
+ .between("insertTime",start,end);
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -1396,7 +1459,6 @@
}
res.add(waterVO);
userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
- break;
}
for (OrderCancel orderCancel : orderCancels) {
WaterVO waterVO = new WaterVO();
@@ -1821,6 +1883,8 @@
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
+ .between("insertTime", start, end)
+
.isNotNull("orderType"));
}else{
@@ -1829,6 +1893,8 @@
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
+ .between("insertTime", start, end)
+
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
@@ -1840,6 +1906,10 @@
}
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
+ settlementDetailEntityWrapper.between("createTime", start, end);
+ if (state!=null && state == 2){
+ settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ }
if (time == 5 && !StringUtils.hasLength(insertTime)){
}else{
@@ -1863,7 +1933,11 @@
continue;
}
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
+
if (tOrderPrivateCar==null){
continue;
}
@@ -1879,23 +1953,47 @@
}
platformVO.setMoney(new BigDecimal(income.getMoney()));
platformVO.setInsertTime(format.format(income.getInsertTime()));
- if (tOrderPrivateCar.getPayType() == null){
+ if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
continue;
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- platformVO.setPayType("手机支付");
- break;
- case 2:
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- platformVO.setPayType("余额支付");
- break;
- case 4:
- platformVO.setPayType("现金支付");
- break;
+ if (tOrderPrivateCar.getState() == 10){
+ // 查询取消订单 用户支付方式
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
+ .eq("orderType", 1)
+ .eq("orderId", tOrderPrivateCar.getId()));
+ if (orderCancel!=null &&orderCancel.getPayType()!=null){
+ switch (orderCancel.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ }
+ }
+ }else{
+ if (tOrderPrivateCar.getPayType()!=null){
+ switch (tOrderPrivateCar.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ case 4:
+ platformVO.setPayType("现金支付");
+ break;
+ }
+ }
}
+
+
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
@@ -1907,7 +2005,10 @@
}
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -1923,22 +2024,44 @@
platformVO.setEndTime(format.format(income.getInsertTime()));
}
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
- if (tOrderLogistics.getPayType() == null){
+ if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
continue;
}
- switch (tOrderLogistics.getPayType()){
- case 1:
- platformVO.setPayType("手机支付");
- break;
- case 2:
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- platformVO.setPayType("余额支付");
- break;
- case 4:
- platformVO.setPayType("现金支付");
- break;
+ if (tOrderLogistics.getState() == 10){
+ // 查询取消订单 用户支付方式
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
+ .eq("orderType", 4)
+ .eq("orderId", tOrderLogistics.getId()));
+ if (orderCancel!=null &&orderCancel.getPayType()!=null){
+ switch (orderCancel.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ }
+ }
+ }else{
+ if (tOrderLogistics.getPayType()!=null){
+ switch (tOrderLogistics.getPayType()){
+ case 1:
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ platformVO.setPayType("余额支付");
+ break;
+ case 4:
+ platformVO.setPayType("现金支付");
+ break;
+ }
+ }
}
// 专车订单
@@ -1953,7 +2076,10 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -1999,7 +2125,10 @@
case 4:
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
--
Gitblit v1.7.1