From 7f3ba0b58c0dc60d18bd25edfab97877c801c0ab Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:09:58 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 236 ++++++++++++++--------
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 343 ++++++++++++----------------------
2 files changed, 269 insertions(+), 310 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 37cf815..af20a78 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
@@ -128,7 +128,7 @@
LocalDate e = LocalDate.parse(endTime);
start = s.atStartOfDay();
end = e.atTime(LocalTime.MAX);
- }else if (time!=null) {
+ }else{
switch (time) {
case 1:
// 获取当天的 00:00:00 和 23:59:59
@@ -172,46 +172,45 @@
}
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
- if (time == null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
- .between("insertTime", start, end)
.isNotNull("orderType"));
}else{
- if (time == 5 && !StringUtils.hasLength(insertTime)){
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 1)
- .eq("objectId",1)
- .ne("type", 1)
- .between("insertTime", start, end)
- .isNotNull("orderType"));
- }else{
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 1)
- .eq("objectId",1)
- .ne("type", 1)
- .isNotNull("orderType")
-
- .between("insertTime", start, end));
- }
-
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType")
+ .between("insertTime", start, end));
}
+
+ 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{
+ settlementDetailEntityWrapper.between("createTime", start, end);
+ }
+ settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
+ Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
+ .stream()
+ .collect(Collectors.toMap(SettlementRecord::getId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
BigDecimal unBalance = new BigDecimal("0");
- // 查询订单是否已结算
-
- // 专车订单结算明细
- List<SettlementDetail> privateCar = settlementDetails.stream().filter(t -> t.getOrderType() == 1).collect(Collectors.toList());
- // 小件物流结算明细
- List<SettlementDetail> xjwl = settlementDetails.stream().filter(t -> t.getOrderType() == 4).collect(Collectors.toList());
-
- // 查询已结算的订单
+ // 查询所有已结算的订单
for (Income income : incomes) {
PlatformVO platformVO = new PlatformVO();
platformVO.setState(1);
@@ -225,63 +224,15 @@
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
.eq("id", income.getIncomeId())
.between("insertTime", start, end));
+
if (tOrderPrivateCar==null){
continue;
}
- platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
- if (tDriver != null){
- platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
- platformVO.setDriverPhone(tDriver.getPhone());
- }
- platformVO.setRemark(tOrderPrivateCar.getRemark());
- if (income.getInsertTime()!=null){
- platformVO.setEndTime(format.format(income.getInsertTime()));
- }
- platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- String string = income.getMoney().toString();
- BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+
+ platformVO.setMoney(new BigDecimal(income.getMoney()));
if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
continue;
}
- 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;
- }
- }
- }
-
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
@@ -299,79 +250,23 @@
if (tOrderLogistics==null){
continue;
}
- platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
- if (tDriver1!=null){
- platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
- platformVO.setDriverPhone(tDriver1.getPhone());
- }
- platformVO.setRemark(tOrderLogistics.getRemark());
platformVO.setMoney(new BigDecimal(income.getMoney()));
- if (income.getInsertTime()!=null){
- platformVO.setEndTime(format.format(income.getInsertTime()));
- }
- platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
+
if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
continue;
}
- 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;
- }
- }
- }
-
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
break;
}
}
-
- EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
- }
- settlementDetailEntityWrapper.between("createTime", start, end);
-
- settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
- // 查询所有现金支付的订单 再根据结算主表判断是否已结算
+ // 查询所有现金支付的订单
for (SettlementDetail settlementDetail : settlementDetails) {
PlatformVO platformVO = new PlatformVO();
switch (settlementDetail.getOrderType()){
case 1:
-
// 专车订单
// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
@@ -381,19 +276,12 @@
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
- if (tDriver!=null){
- 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){
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(settlementDetail.getSettlementRecordId());
if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
if (state!=null && state!=1){
continue;
@@ -401,7 +289,7 @@
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
}else{
// 未结算
if (state!=null && state!=2){
@@ -409,7 +297,6 @@
}
platformVO.setState(2);
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
}else{
// 未结算
@@ -418,7 +305,6 @@
}
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
-
res.add(platformVO);
break;
case 4:
@@ -431,20 +317,11 @@
if (tOrderLogistics==null){
continue;
}
- platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
- if (tDriver1!=null){
- platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
- platformVO.setDriverPhone(tDriver1.getPhone());
- }
- platformVO.setRemark(tOrderLogistics.getRemark());
String string1 = settlementDetail.getPrice().toString();
BigDecimal bigDecimal2 = new BigDecimal(string1);
platformVO.setMoney(bigDecimal2);
- platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
- platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(settlementDetail.getSettlementRecordId());
if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
if (state!=null && state!=1){
continue;
@@ -719,7 +596,18 @@
// 用户提现金额
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
-
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user1 -> user1));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user1 -> user1));
+ Map<Integer, PaymentRecord> paymentRecordMap = paymentRecordService.selectList(new EntityWrapper<PaymentRecord>())
+ .stream()
+ .collect(Collectors.toMap(PaymentRecord::getId, user1 -> user1));
+ Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
+ .stream()
+ .collect(Collectors.toMap(SettlementRecord::getId, user1 -> user1));
// 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (payType!=null){
@@ -743,7 +631,7 @@
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = tOrderPrivateCar.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser user1 = userMap.get(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
waterVO.setPhone(user1.getPhone());
@@ -768,7 +656,7 @@
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
+ TUser user2 = userMap.get(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -818,7 +706,7 @@
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser user1 = userMap.get(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
waterVO.setPhone(user1.getPhone());
@@ -841,7 +729,7 @@
waterVO1.setCode(tOrderLogistics1.getOrderNum());
String string1 = orderCancel.getMoney().toString();
waterVO1.setMoney(new BigDecimal(string1)+"");
- TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
+ TUser user2 = userMap.get(tOrderLogistics1.getUserId());
if (user2!=null){
waterVO1.setName(user2.getNickName());
waterVO1.setPhone(user2.getPhone());
@@ -877,7 +765,7 @@
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
waterVO.setCode(tPubWithdrawal.getCode());
- TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ TDriver tDriver = driverMap.get(tPubWithdrawal.getUserId());
if (tDriver!=null){
waterVO.setName(tDriver.getFirstName()+tDriver.getLastName());
waterVO.setPhone(tDriver.getPhone());
@@ -902,7 +790,7 @@
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
waterVO.setCode(tPubWithdrawal.getCode());
- TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
+ TUser user2 = userMap.get(tPubWithdrawal.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -918,7 +806,8 @@
for (TPubTransactionDetails tPubTransactionDetail : tPubTransactionDetails) {
WaterVO waterVO = new WaterVO();
Integer orderId = tPubTransactionDetail.getOrderId();
- PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
+ PaymentRecord paymentRecord = paymentRecordMap.get(orderId);
+
if (paymentRecord!=null){
if (paymentRecord.getState() == 1){
// 临时数据
@@ -960,7 +849,7 @@
continue;
}
if (paymentRecord.getUserId()!=null){
- TUser user2 = appUserService.selectById(paymentRecord.getUserId());
+ TUser user2 = userMap.get(paymentRecord.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -978,7 +867,7 @@
platformVO.setType("司机结算");
switch (income.getOrderType()){
case 1:
- SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(income.getSettlementRecordId());
if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
if (settlementRecord.getPayType()!=null){
switch (settlementRecord.getPayType()){
@@ -1017,7 +906,7 @@
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver != null){
platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setPhone(tDriver.getPhone());
@@ -1047,7 +936,7 @@
case 4:
// 小件物流
// 查询订单信息
- SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
+ SettlementRecord settlementRecord1 = settlementRecordMap.get(income.getSettlementRecordId());
if (settlementRecord1!=null){
if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
switch (settlementRecord1.getPayType()){
@@ -1109,7 +998,7 @@
continue;
}
platformVO.setCode(tOrderLogistics1.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
+ TDriver tDriver1 = driverMap.get(tOrderLogistics1.getDriverId());
if (tDriver1!=null){
platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setPhone(tDriver1.getPhone());
@@ -1265,37 +1154,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).between("insertTime",start,end);
+ .eq("userType", 2);
// 用户专车订单wrapper
tOrderPrivateCarEntityWrapper
.isNotNull("payMoney")
- .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
+ .in("payType",Arrays.asList(1, 2));
// 用户小件物流订单wrapper
tOrderLogisticsEntityWrapper
.isNotNull("payMoney")
- .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
+ .in("payType",Arrays.asList(1, 2));
// 司机手动结算金额
orderType1 = new EntityWrapper<SettlementDetail>()
.isNotNull("settlementRecordId")
- .in("orderType", Arrays.asList(1, 4)).between("insertTime",start,end);
+ .in("orderType", Arrays.asList(1, 4));
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
.in("payType",integers)
.eq("userType", 1)
- .between("insertTime",start,end);
+ ;
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -1391,7 +1280,18 @@
// 用户提现金额
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
-
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user1 -> user1));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user1 -> user1));
+ Map<Integer, PaymentRecord> paymentRecordMap = paymentRecordService.selectList(new EntityWrapper<PaymentRecord>())
+ .stream()
+ .collect(Collectors.toMap(PaymentRecord::getId, user1 -> user1));
+ Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
+ .stream()
+ .collect(Collectors.toMap(SettlementRecord::getId, user1 -> user1));
// 用户订单消费
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (payType!=null){
@@ -1415,7 +1315,7 @@
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = tOrderPrivateCar.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser user1 = userMap.get(tOrderPrivateCar.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
waterVO.setPhone(user1.getPhone());
@@ -1440,7 +1340,7 @@
waterVO.setCode(tOrderLogistic.getOrderNum());
String string = tOrderLogistic.getPayMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
+ TUser user2 = userMap.get(tOrderLogistic.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -1490,7 +1390,7 @@
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
waterVO.setMoney(new BigDecimal(string)+"");
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser user1 = userMap.get(orderCancel.getUserId());
if (user1!=null){
waterVO.setName(user1.getNickName());
waterVO.setPhone(user1.getPhone());
@@ -1513,7 +1413,7 @@
waterVO1.setCode(tOrderLogistics1.getOrderNum());
String string1 = orderCancel.getMoney().toString();
waterVO1.setMoney(new BigDecimal(string1)+"");
- TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
+ TUser user2 = userMap.get(tOrderLogistics1.getUserId());
if (user2!=null){
waterVO1.setName(user2.getNickName());
waterVO1.setPhone(user2.getPhone());
@@ -1549,7 +1449,7 @@
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
waterVO.setCode(tPubWithdrawal.getCode());
- TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ TDriver tDriver = driverMap.get(tPubWithdrawal.getUserId());
if (tDriver!=null){
waterVO.setName(tDriver.getFirstName()+tDriver.getLastName());
waterVO.setPhone(tDriver.getPhone());
@@ -1574,7 +1474,7 @@
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
waterVO.setCode(tPubWithdrawal.getCode());
- TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
+ TUser user2 = userMap.get(tPubWithdrawal.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -1590,7 +1490,7 @@
for (TPubTransactionDetails tPubTransactionDetail : tPubTransactionDetails) {
WaterVO waterVO = new WaterVO();
Integer orderId = tPubTransactionDetail.getOrderId();
- PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
+ PaymentRecord paymentRecord = paymentRecordMap.get(orderId);
if (paymentRecord!=null){
if (paymentRecord.getState() == 1){
// 临时数据
@@ -1632,7 +1532,7 @@
continue;
}
if (paymentRecord.getUserId()!=null){
- TUser user2 = appUserService.selectById(paymentRecord.getUserId());
+ TUser user2 = userMap.get(paymentRecord.getUserId());
if (user2!=null){
waterVO.setName(user2.getNickName());
waterVO.setPhone(user2.getPhone());
@@ -1650,7 +1550,7 @@
platformVO.setType("司机结算");
switch (income.getOrderType()){
case 1:
- SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(income.getSettlementRecordId());
if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
if (settlementRecord.getPayType()!=null){
switch (settlementRecord.getPayType()){
@@ -1689,7 +1589,7 @@
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver != null){
platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setPhone(tDriver.getPhone());
@@ -1719,7 +1619,7 @@
case 4:
// 小件物流
// 查询订单信息
- SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
+ SettlementRecord settlementRecord1 = settlementRecordMap.get(income.getSettlementRecordId());
if (settlementRecord1!=null){
if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
switch (settlementRecord1.getPayType()){
@@ -1774,14 +1674,14 @@
case 3:
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());
+ TDriver tDriver1 = driverMap.get(tOrderLogistics1.getDriverId());
if (tDriver1!=null){
platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setPhone(tDriver1.getPhone());
@@ -1878,33 +1778,21 @@
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
- if (time == null){
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
.ne("type", 1)
- .between("insertTime", start, end)
-
.isNotNull("orderType"));
}else{
-
- if (time == 5 && !StringUtils.hasLength(insertTime)){
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 1)
- .eq("objectId",1)
- .ne("type", 1)
- .between("insertTime", start, end)
-
- .isNotNull("orderType"));
- }else{
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 1)
- .eq("objectId",1)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
- }
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType")
+ .between("insertTime", start, end));
}
+
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
@@ -1918,7 +1806,18 @@
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user -> user));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
+ Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
+ .stream()
+ .collect(Collectors.toMap(SettlementRecord::getId, user -> user));
+ Map<Integer, SettlementDetail> settlementDetailMap = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>())
+ .stream()
+ .collect(Collectors.toMap(SettlementDetail::getId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
@@ -1942,7 +1841,7 @@
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver != null){
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
@@ -2013,7 +1912,7 @@
continue;
}
platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
+ TDriver tDriver1 = driverMap.get(tOrderLogistics.getDriverId());
if (tDriver1!=null){
platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setDriverPhone(tDriver1.getPhone());
@@ -2084,7 +1983,7 @@
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
- TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver!=null){
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
@@ -2096,7 +1995,7 @@
platformVO.setMoney(bigDecimal1);
platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(settlementDetail.getSettlementRecordId());
if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
if (state!=null && state!=1){
continue;
@@ -2104,7 +2003,7 @@
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
+ platformVO.setEndTime(format.format(settlementDetail.getCreateTime()));
}else{
// 未结算
if (state!=null && state!=2){
@@ -2133,7 +2032,7 @@
continue;
}
platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
+ TDriver tDriver1 = driverMap.get(tOrderLogistics.getDriverId());
if (tDriver1!=null){
platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setDriverPhone(tDriver1.getPhone());
@@ -2145,7 +2044,7 @@
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
platformVO.setPayType("现金支付");
if (settlementDetail.getSettlementRecordId()!=null){
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ SettlementRecord settlementRecord = settlementRecordMap.get(settlementDetail.getSettlementRecordId());
if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
if (state!=null && state!=1){
continue;
@@ -2153,7 +2052,7 @@
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ platformVO.setEndTime(format.format(settlementDetail.getCreateTime()));
}else{
// 未结算
if (state!=null && state!=2){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index d7c9a39..996c78a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -212,48 +212,48 @@
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
.isNotNull("discountMoney")
- .between("insertTime", start, end);
+ ;
// 小件物流wrapper
between1 = new EntityWrapper<TOrderLogistics>()
.isNotNull("activityId")
.isNotNull("discountMoney")
- .between("insertTime", start, end);
+ ;
// 已使用优惠券记录wrapper
between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
.isNotNull("couponMoney")
- .between("insertTime", start, end);
+ ;
between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
.isNotNull("couponMoney")
- .between("insertTime", start, end);
+ ;
// 已使用红包记录wrapper
between3 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
- .between("insertTime", start, end);
+ ;
between33 = new EntityWrapper<TOrderLogistics>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
- .between("insertTime", start, end);
+ ;
// 司机已消费金额
between4 = new EntityWrapper<BalanceUsageRecord>()
.eq("type",1)
.ne("purpose", 6)
- .between("insertTime", start, end);
+ ;
// 司机提现
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("type",1)
.eq("userType", 2)
- .between("insertTime", start, end);
+ ;
;
}else{
@@ -354,6 +354,14 @@
BigDecimal driverConsume = new BigDecimal("0");
// 司机已提现
BigDecimal driverWithdrawal1 = new BigDecimal("0");
+ // 一次性查询所有用户信息
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user -> user));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
+
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
@@ -361,8 +369,8 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (tUser!=null){
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
+ if (tUser != null) {
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
@@ -374,8 +382,8 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (tUser!=null){
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
+ if (tUser != null) {
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
@@ -393,13 +401,13 @@
continue;
}
grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
- if (tUser!=null){
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
+ if (tUser != null) {
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getRedPacketMoney().toString()));
}
for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
GrantVO grantVO = new GrantVO();
@@ -412,13 +420,13 @@
continue;
}
grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
- if (tUser!=null){
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
+ if (tUser != null) {
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getRedPacketMoney().toString()));
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
@@ -426,12 +434,12 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
- if (tUser!=null){
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
+ if (tUser != null) {
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
for (TOrderLogistics userCouponRecord : userCouponRecords1) {
@@ -439,12 +447,12 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
// 司机消费奖励
@@ -453,7 +461,7 @@
grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverMap.get(balanceUsageRecord.getDriverId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
@@ -488,7 +496,8 @@
grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
+
+ TDriver tUser = driverMap.get(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
@@ -618,50 +627,57 @@
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
.isNotNull("discountMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
// 小件物流wrapper
between1 = new EntityWrapper<TOrderLogistics>()
.isNotNull("activityId")
.isNotNull("discountMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
// 已使用优惠券记录wrapper
between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
.isNotNull("couponMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
.isNotNull("couponMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
// 已使用红包记录wrapper
between3 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
between33 = new EntityWrapper<TOrderLogistics>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
- .between("insertTime", start, end);
+// .between("insertTime", start, end)
+ ;
// 司机已消费金额
between4 = new EntityWrapper<BalanceUsageRecord>()
.eq("type",1)
.ne("purpose", 6)
- .between("insertTime", start, end);
+// .between("createTime", start, end)
+ ;
// 司机提现
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("type",1)
.eq("userType", 2)
- .between("insertTime", start, end);
-
+// .between("insertTime", start, end)
;
+
}else{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
@@ -760,6 +776,13 @@
BigDecimal driverConsume = new BigDecimal("0");
// 司机已提现
BigDecimal driverWithdrawal1 = new BigDecimal("0");
+ // 一次性查询所有用户信息
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user -> user));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
@@ -767,7 +790,7 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
@@ -780,7 +803,7 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
@@ -792,12 +815,6 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
-// JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
-// BigDecimal temp = new BigDecimal(BigInteger.ZERO);
-// for (int i = 0; i < objects.size(); i++) {
-// String string = objects.getJSONObject(i).getString("money");
-// temp = temp.add(new BigDecimal(string));
-// }
if (userRedPacketRecord.getRedPacketMoney()==null){
continue;
}
@@ -805,7 +822,7 @@
continue;
}
grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
@@ -824,13 +841,13 @@
continue;
}
grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getRedPacketMoney().toString()));
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
@@ -838,12 +855,12 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
for (TOrderLogistics userCouponRecord : userCouponRecords1) {
@@ -851,12 +868,12 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
// 司机消费奖励
@@ -865,7 +882,8 @@
grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverMap.get(balanceUsageRecord.getDriverId());
+
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
@@ -900,7 +918,7 @@
grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
+ TDriver tUser = driverMap.get(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
@@ -1116,6 +1134,24 @@
BigDecimal coupon = new BigDecimal("0");
// 已领取司机奖励总额（司机端）
BigDecimal driver = new BigDecimal("0");
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user -> user));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
+ Map<Integer, UserActivity> userActivityMap = userActivityService.selectList(new EntityWrapper<UserActivity>())
+ .stream()
+ .collect(Collectors.toMap(UserActivity::getId, user -> user));
+ Map<Integer, UserActivityDiscount1> userActivityDiscountMap = userActivityDiscount1Service.selectList(new EntityWrapper<UserActivityDiscount1>())
+ .stream()
+ .collect(Collectors.toMap(UserActivityDiscount1::getId, user -> user));
+ Map<Integer, UserActivityRedenvelope> userActivityRedenvelopeMap = userActivityRedenvelopeService.selectList(new EntityWrapper<UserActivityRedenvelope>())
+ .stream()
+ .collect(Collectors.toMap(UserActivityRedenvelope::getId, user -> user));
+ Map<Integer, SysCouponActivity> sysCouponActivityMap = sysCouponActivityService.selectList(new EntityWrapper<SysCouponActivity>())
+ .stream()
+ .collect(Collectors.toMap(SysCouponActivity::getId, user -> user));
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
@@ -1126,13 +1162,13 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectById(tOrderPrivateCar.getActivityId());
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscountMap.get(tOrderPrivateCar.getActivityId());
if (userActivityDiscount1!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityDiscount1.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityDiscount1.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1150,13 +1186,13 @@
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectById(tOrderPrivateCar.getActivityId());
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscountMap.get(tOrderPrivateCar.getActivityId());
if (userActivityDiscount1!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityDiscount1.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityDiscount1.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1169,7 +1205,7 @@
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
grantVO.setAmount(userRedPacketRecord.getMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
@@ -1178,10 +1214,11 @@
grantVO.setRemark("指定发放");
}
- UserActivityRedenvelope userActivityRedenvelope =
- userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
+
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeMap.get(userRedPacketRecord.getRedPacketActivityId());
+
if (userActivityRedenvelope!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityRedenvelope.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityRedenvelope.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1195,11 +1232,12 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(userCouponRecord.getCouponActivityId());
+ SysCouponActivity sysCouponActivity = sysCouponActivityMap.get(userCouponRecord.getCouponActivityId());
+
if (sysCouponActivity!=null){
grantVO.setRemark(sysCouponActivity.getName());
}
@@ -1212,7 +1250,7 @@
grantVO.setInsertTime(format.format(driverActivityHistory.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(driverActivityHistory.getMoney().toString());
- TDriver tDriver = driverService.selectById(driverActivityHistory.getDriverId());
+ TDriver tDriver = driverMap.get(driverActivityHistory.getDriverId());
if (tDriver!=null){
grantVO.setName(tDriver.getFirstName()+tDriver.getLastName());
}
@@ -1302,6 +1340,7 @@
break;
}
}
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 列表res
List<GrantVO> res = new ArrayList<>();
@@ -1382,6 +1421,7 @@
.eq("carryOut", 2)
.between("insertTime", start, end);
}
+
if (type!=null){
switch (type){
@@ -1425,12 +1465,27 @@
BigDecimal coupon = new BigDecimal("0");
// 已领取司机奖励总额（司机端）
BigDecimal driver = new BigDecimal("0");
+ Map<Integer, TUser> userMap = appUserService.selectList(new EntityWrapper<TUser>())
+ .stream()
+ .collect(Collectors.toMap(TUser::getId, user -> user));
+ Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
+ .stream()
+ .collect(Collectors.toMap(TDriver::getId, user -> user));
+ Map<Integer, UserActivity> userActivityMap = userActivityService.selectList(new EntityWrapper<UserActivity>())
+ .stream()
+ .collect(Collectors.toMap(UserActivity::getId, user -> user));
+ Map<Integer, UserActivityDiscount1> userActivityDiscountMap = userActivityDiscount1Service.selectList(new EntityWrapper<UserActivityDiscount1>())
+ .stream()
+ .collect(Collectors.toMap(UserActivityDiscount1::getId, user -> user));
+ Map<Integer, UserActivityRedenvelope> userActivityRedenvelopeMap = userActivityRedenvelopeService.selectList(new EntityWrapper<UserActivityRedenvelope>())
+ .stream()
+ .collect(Collectors.toMap(UserActivityRedenvelope::getId, user -> user));
+ Map<Integer, SysCouponActivity> sysCouponActivityMap = sysCouponActivityService.selectList(new EntityWrapper<SysCouponActivity>())
+ .stream()
+ .collect(Collectors.toMap(SysCouponActivity::getId, user -> user));
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- if (tOrderPrivateCar.getDiscountMoney()== null){
- continue;
- }
- if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
}
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
@@ -1438,13 +1493,13 @@
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectById(tOrderPrivateCar.getActivityId());
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscountMap.get(tOrderPrivateCar.getActivityId());
if (userActivityDiscount1!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityDiscount1.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityDiscount1.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1452,24 +1507,23 @@
res.add(grantVO);
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
- if (tOrderPrivateCar.getDiscountMoney()== null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
}
- if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
- continue;
- }
+
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
grantVO.setType("折扣");
+
grantVO.setAmount(tOrderPrivateCar.getDiscountMoney().toString());
- TUser tUser = appUserService.selectById(tOrderPrivateCar.getUserId());
+ TUser tUser = userMap.get(tOrderPrivateCar.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectById(tOrderPrivateCar.getActivityId());
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscountMap.get(tOrderPrivateCar.getActivityId());
if (userActivityDiscount1!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityDiscount1.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityDiscount1.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1482,14 +1536,20 @@
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
grantVO.setAmount(userRedPacketRecord.getMoney().toString());
- TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
+ TUser tUser = userMap.get(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- UserActivityRedenvelope userActivityRedenvelope =
- userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
+ if (userRedPacketRecord.getIsGrant() == 1){
+ // 后台发放的红包
+ grantVO.setRemark("指定发放");
+ }
+
+
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeMap.get(userRedPacketRecord.getRedPacketActivityId());
+
if (userActivityRedenvelope!=null){
- UserActivity userActivity = userActivityService.selectById(userActivityRedenvelope.getUserActivityId());
+ UserActivity userActivity = userActivityMap.get(userActivityRedenvelope.getUserActivityId());
if (userActivity!=null){
grantVO.setRemark(userActivity.getName());
}
@@ -1503,14 +1563,14 @@
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
grantVO.setAmount(userCouponRecord.getMoney().toString());
- TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
+ TUser tUser = userMap.get(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- SysCouponRecord sysCouponRecord =
- sysCouponRecordService.selectById(userCouponRecord.getCouponId());
- if (sysCouponRecord!=null){
- grantVO.setRemark(sysCouponRecord.getName());
+ SysCouponActivity sysCouponActivity = sysCouponActivityMap.get(userCouponRecord.getCouponActivityId());
+
+ if (sysCouponActivity!=null){
+ grantVO.setRemark(sysCouponActivity.getName());
}
coupon = coupon.add(new BigDecimal(userCouponRecord.getMoney().toString()));
res.add(grantVO);
@@ -1521,7 +1581,7 @@
grantVO.setInsertTime(format.format(driverActivityHistory.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(driverActivityHistory.getMoney().toString());
- TDriver tDriver = driverService.selectById(driverActivityHistory.getDriverId());
+ TDriver tDriver = driverMap.get(driverActivityHistory.getDriverId());
if (tDriver!=null){
grantVO.setName(tDriver.getFirstName()+tDriver.getLastName());
}
--
Gitblit v1.7.1