From f85ea638d98b302c590e65f00e6912d91601613c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 09 十一月 2024 15:53:53 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 96 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 34 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 16814ff..d7c9a39 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
@@ -211,34 +211,50 @@
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
- .isNotNull("discountMoney");
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+
// 小件物流wrapper
between1 = new EntityWrapper<TOrderLogistics>()
.isNotNull("activityId")
- .isNotNull("discountMoney");
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+
// 已使用优惠券记录wrapper
between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
- .isNotNull("couponMoney");
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+
between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
- .isNotNull("couponMoney");
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+
// 已使用红包记录wrapper
between3 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("redPacketId")
- .isNotNull("redPacketMoney");
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+
between33 = new EntityWrapper<TOrderLogistics>()
.isNotNull("redPacketId")
- .isNotNull("redPacketMoney");
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+
// 司机已消费金额
between4 = new EntityWrapper<BalanceUsageRecord>()
.eq("type",1)
- .ne("purpose", 6);
+ .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{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
@@ -370,12 +386,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;
}
@@ -395,13 +405,13 @@
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;
}
- grantVO.setAmount(temp.toString());
+ if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
+ continue;
+ }
+ grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -607,34 +617,50 @@
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
- .isNotNull("discountMoney");
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+
// 小件物流wrapper
between1 = new EntityWrapper<TOrderLogistics>()
.isNotNull("activityId")
- .isNotNull("discountMoney");
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+
// 已使用优惠券记录wrapper
between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
- .isNotNull("couponMoney");
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+
between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
- .isNotNull("couponMoney");
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+
// 已使用红包记录wrapper
between3 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("redPacketId")
- .isNotNull("redPacketMoney");
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+
between33 = new EntityWrapper<TOrderLogistics>()
.isNotNull("redPacketId")
- .isNotNull("redPacketMoney");
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+
// 司机已消费金额
between4 = new EntityWrapper<BalanceUsageRecord>()
.eq("type",1)
- .ne("purpose", 6);
+ .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{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
@@ -785,19 +811,19 @@
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(userRedPacketRecord.getRedPacketMoney());
}
for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
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;
}
- grantVO.setAmount(temp.toString());
+ if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
+ continue;
+ }
+ grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -882,12 +908,14 @@
driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
res.add(grantVO);
}
+
+
// 总额
total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
// 已使用司机奖励合计
driver = driverConsume.add(driverWithdrawal1);
UseMoneyVO useMoneyVO = new UseMoneyVO();
- useMoneyVO.setTotal(total.add(driver));
+ useMoneyVO.setTotal(total);
useMoneyVO.setDiscount(discount);
useMoneyVO.setRedPackage(redPackage);
useMoneyVO.setCoupon(coupon);
--
Gitblit v1.7.1