From b0a224caed1e2d137a5960bcb04ce8f80141c939 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 16:59:25 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 33 ---------------------------------
1 files changed, 0 insertions(+), 33 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 29a9323..ac538d1 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
@@ -177,41 +177,29 @@
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
.isNotNull("discountMoney")
-
-
.between("insertTime", start, end);
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
.isNotNull("activityId")
.isNotNull("discountMoney")
-
-
.between("insertTime", start, end);
// 已使用优惠券记录wrapper
Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
.isNotNull("couponMoney")
-
-
.between("insertTime", start, end);
Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
.isNotNull("couponMoney")
-
-
.between("insertTime", start, end);
// 已使用红包记录wrapper
Wrapper<TOrderPrivateCar> between3 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
-
-
.between("insertTime", start, end);
Wrapper<TOrderLogistics> between33 = new EntityWrapper<TOrderLogistics>()
.isNotNull("redPacketId")
.isNotNull("redPacketMoney")
-
-
.between("insertTime", start, end);
// 司机已消费金额
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
@@ -280,9 +268,6 @@
BigDecimal driverWithdrawal1 = new BigDecimal("0");
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- 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()));
@@ -296,9 +281,6 @@
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
- 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()));
@@ -312,9 +294,6 @@
}
// 查询已领取红包总额
for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
- if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
@@ -328,9 +307,6 @@
redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
}
for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
- if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
@@ -345,9 +321,6 @@
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
- if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
@@ -361,9 +334,6 @@
res.add(grantVO);
}
for (TOrderLogistics userCouponRecord : userCouponRecords1) {
- if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
@@ -532,15 +502,12 @@
.isNotNull("activityId")
.isNotNull("discountMoney")
.between("insertTime", start, end)
-
;
// 已使用优惠券记录wrapper
Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("couponId")
.isNotNull("couponMoney")
.between("insertTime", start, end)
-
-
;
Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>()
.isNotNull("couponId")
--
Gitblit v1.7.1