From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 282 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 248 insertions(+), 34 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 191fed6..d924c2c 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
@@ -12,6 +12,8 @@
import com.stylefeng.guns.modular.system.vo.PlatformVO;
import com.stylefeng.guns.modular.system.vo.WaterMoneyVO;
import com.stylefeng.guns.modular.system.vo.WaterVO;
+import io.swagger.models.auth.In;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -316,6 +318,7 @@
PlatformVO platformVO = new PlatformVO();
switch (settlementDetail.getOrderType()){
case 1:
+
// 专车订单
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
if (tOrderPrivateCar==null){
@@ -352,6 +355,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
@@ -394,6 +403,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -512,6 +527,13 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
+ // 用户取消订单wrapper
+ Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
+ // 用户取消订单记录
+ List<OrderCancel> orderCancels = new ArrayList<>();
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -538,6 +560,10 @@
// 司机手动结算金额
orderType1 = new EntityWrapper<SettlementDetail>()
.in("orderType", Arrays.asList(1, 4));
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .eq("userType", 1).in("payType",integers)
+ ;
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -567,16 +593,21 @@
.isNotNull("payMoney")
.in("payType",Arrays.asList(1, 2))
.between("insertTime", start, end);
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .eq("userType", 1)
+ .in("payType",integers)
+ .between("insertTime", start, end);
}
-
-
if (type != null){
switch (type){
case 1:
// 只查询用户订单
- tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
-
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .eq("userType", 1);
break;
case 2:
// 只查询用户充值
@@ -604,6 +635,8 @@
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");
@@ -617,6 +650,7 @@
BigDecimal driverWithdrawal = new BigDecimal("0");
// 用户提现金额
BigDecimal userWithdrawal = new BigDecimal("0");
+
// 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (payType!=null){
@@ -640,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){
@@ -668,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());
@@ -691,10 +725,86 @@
userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
break;
}
+ for (OrderCancel orderCancel : orderCancels) {
+ WaterVO waterVO = new WaterVO();
+ switch (orderCancel.getOrderType()){
+ case 1:
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
+ if (tOrderPrivateCar == null){
+ continue;
+ }
+ waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
+ waterVO.setType("用户订单消费");
+ if (payType!=null){
+ if (!Objects.equals(tOrderPrivateCar.getPayType(), payType)){
+ continue;
+ }
+ }
+ 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)+"");
+ TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ if (user1!=null){
+ waterVO.setName(user1.getNickName());
+ waterVO.setPhone(user1.getPhone());
+ }
+ waterVO.setRemark(tOrderPrivateCar.getRemark());
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ break;
+ case 4:
+ TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
+ if (payType!=null){
+ if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
+ continue;
+ }
+ }
+ WaterVO waterVO1 = new WaterVO();
+ waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
+ waterVO1.setType("用户订单消费");
+ // 小件物流
+ waterVO1.setCode(tOrderLogistics1.getOrderNum());
+ String string1 = orderCancel.getMoney().toString();
+ 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 (orderCancel.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
+ break;
+ }
+ waterVO1.setRemark(tOrderLogistics1.getRemark());
+ res.add(waterVO1);
+ userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ break;
+ }
+ }
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -706,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);
@@ -715,7 +825,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -728,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);
@@ -768,7 +878,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -841,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;
}
@@ -899,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()));
}
@@ -940,6 +1050,8 @@
private IPaymentRecordService paymentRecordService;
@Autowired
private ITUserService appUserService;
+ @Autowired
+ private IOrderCancelService orderCancelService;
@RequestMapping(value = "/water/list")
@ResponseBody
public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
@@ -1014,6 +1126,8 @@
// 用户小件物流订单记录
List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
+ // 用户取消订单记录
+ List<OrderCancel> orderCancels = new ArrayList<>();
// 用户充值
List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
// 司机结算总额
@@ -1032,8 +1146,13 @@
EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
// 用户小件物流订单wrapper
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
+ // 用户取消订单wrapper
+ Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -1061,6 +1180,10 @@
orderType1 = new EntityWrapper<SettlementDetail>()
.isNotNull("settlementRecordId")
.in("orderType", Arrays.asList(1, 4));
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .in("payType",integers)
+ .eq("userType", 1);
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -1091,6 +1214,11 @@
.isNotNull("payMoney")
.in("payType",Arrays.asList(1, 2))
.between("insertTime", start, end);
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .eq("userType", 1)
+ .in("payType",integers)
+ .between("insertTime", start, end);
}
@@ -1100,7 +1228,7 @@
// 只查询用户订单
tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
-
+ orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
break;
case 2:
// 只查询用户充值
@@ -1128,6 +1256,7 @@
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");
@@ -1161,13 +1290,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.setMoney(new BigDecimal(string)+"");
TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
@@ -1192,8 +1317,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());
@@ -1215,9 +1340,86 @@
userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
break;
}
+ for (OrderCancel orderCancel : orderCancels) {
+ WaterVO waterVO = new WaterVO();
+ switch (orderCancel.getOrderType()){
+ case 1:
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
+ if (tOrderPrivateCar == null){
+ continue;
+ }
+ waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
+ waterVO.setType("用户订单消费");
+ if (payType!=null){
+ if (!Objects.equals(tOrderPrivateCar.getPayType(), payType)){
+ continue;
+ }
+ }
+ 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)+"");
+ TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ if (user1!=null){
+ waterVO.setName(user1.getNickName());
+ waterVO.setPhone(user1.getPhone());
+ }
+ waterVO.setRemark(tOrderPrivateCar.getRemark());
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ break;
+ case 4:
+ TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
+ if (payType!=null){
+ if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
+ continue;
+ }
+ }
+ WaterVO waterVO1 = new WaterVO();
+ waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
+ waterVO1.setType("用户订单消费");
+ // 小件物流
+ waterVO1.setCode(tOrderLogistics1.getOrderNum());
+ String string1 = orderCancel.getMoney().toString();
+ 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 (orderCancel.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ waterVO.setPayType("余额支付");
+ break;
+ }
+ waterVO1.setRemark(tOrderLogistics1.getRemark());
+
+ res.add(waterVO1);
+ userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
+ break;
+ }
+ }
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1229,8 +1431,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);
@@ -1238,7 +1440,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1249,8 +1451,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);
@@ -1293,7 +1495,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -1364,7 +1566,7 @@
if (income.getPrice() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1446,7 +1648,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()));
}
@@ -1707,6 +1909,12 @@
platformVO.setState(2);
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -1748,6 +1956,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
--
Gitblit v1.7.1