From 4506fb4becb6caf6441c86d0085336ef56ab3677 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 十一月 2024 09:53:12 +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/TSubsidyController.java | 236 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 148 insertions(+), 88 deletions(-)
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