From f9fff682ff6b21344401bb86f85d25c97c37b073 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 17:01:37 +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 | 495 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 326 insertions(+), 169 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..337033c 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
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -21,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.temporal.TemporalAdjusters;
@@ -86,6 +89,17 @@
private ISysCouponRecordService sysCouponRecordService;
@Autowired
private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+ public static void main(String[] args) {
+ String temp = "[{\"money\":14.46,\"id\":91},{\"money\":1,\"id\":90}]";
+ JSONArray objects = JSONArray.parseArray(temp);
+ BigDecimal temp1 = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp1 = temp1.add(new BigDecimal(string));
+ }
+ System.err.println(temp1);
+ }
/**
* 使用补贴统计
*/
@@ -167,61 +181,105 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
- // 司机提现wrapper
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
+
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
+ ;
// 专车wrapper
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>()
- .ne("purpose", 6)
- .between("createTime", start, end);
- // 司机提现
- Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
+ ;
+ if (time == 5 && insertTime==null){
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ ;
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6);
+ // 司机提现
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ ;
+ }else{
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ .between("insertTime", start, end);
+ // 专车wrapper
+ 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>()
+ .ne("purpose", 6)
+ .between("createTime", start, end);
+ // 司机提现
+ }
+ // 司机提现wrapper
if (type!=null){
switch (type){
case 1:
@@ -237,8 +295,7 @@
case 3:
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
-
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -261,7 +318,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
}
// 已发放补贴总额
@@ -280,9 +337,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()));
@@ -293,12 +347,9 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
-
+ res.add(grantVO);
}
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()));
@@ -309,16 +360,20 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
+ res.add(grantVO);
}
- // 查询已领取红包总额
+ // 查询已使用红包总额
for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
- if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ 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));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -328,13 +383,16 @@
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("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ 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));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -345,13 +403,10 @@
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
- if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -361,13 +416,10 @@
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("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -412,20 +464,16 @@
res.add(grantVO);
}
// 司机提现
- for (BalanceUsageRecord balanceUsageRecord : driverWithdrawal) {
+ for (TPubWithdrawal balanceUsageRecord : driverWithdrawal) {
GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
+ grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
- switch (balanceUsageRecord.getPurpose()){
- case 6:
- grantVO.setRemark("司机提现");
- break;
- }
+ grantVO.setRemark("司机提现");
driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
res.add(grantVO);
}
@@ -514,63 +562,100 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
- // 司机提现wrapper
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
+ ;
// 专车wrapper
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>()
- .ne("purpose", 6)
- .between("createTime", start, end);
+ ;
// 司机提现
- Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
+ Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
+ ;
+ if (time == 5 && insertTime==null){
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ ;
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6);
+
+ }else{
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ .between("insertTime", start, end);
+ // 专车wrapper
+ 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>()
+ .ne("purpose", 6)
+ .between("createTime", start, end);
+ }
if (type!=null){
switch (type){
@@ -588,7 +673,7 @@
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -611,7 +696,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(between44);
}
// 已发放补贴总额
@@ -669,7 +754,13 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ 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));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -685,7 +776,13 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ 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));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -702,7 +799,7 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -718,7 +815,7 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -764,24 +861,19 @@
res.add(grantVO);
}
// 司机提现
- for (BalanceUsageRecord balanceUsageRecord : driverWithdrawal) {
+ for (TPubWithdrawal balanceUsageRecord : driverWithdrawal) {
GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
+ grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
- switch (balanceUsageRecord.getPurpose()){
- case 6:
- grantVO.setRemark("司机提现");
- break;
- }
+ grantVO.setRemark("司机提现");
driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
res.add(grantVO);
}
-
// 总额
total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
// 已使用司机奖励合计
@@ -794,7 +886,6 @@
useMoneyVO.setDriver(driver);
useMoneyVO.setDriverWithdrawal(driverWithdrawal1);
useMoneyVO.setDriverConsume(driverConsume);
-
return useMoneyVO;
}
@@ -879,31 +970,69 @@
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("discountMoney")
- .between("insertTime", start, end)
;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-
;
// 优惠券领取记录wrapper
Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
- .ne("couponUseType", 2)
- .ne("couponUseType", 3)
- .between("insertTime", start, end);
+ ;
// 红包领取记录wrapper
Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
- .ne("orderType", 2)
- .ne("orderType", 3)
- .between("insertTime", start, end);
+ ;
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
- .eq("carryOut", 2)
- .between("insertTime", start, end);
+ ;
+ if (time == 5 && insertTime==null){
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ ;
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ ;
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ ;
+ }else{
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end)
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .between("insertTime", start, end)
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ .between("insertTime", start, end);
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ .between("insertTime", start, end);
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ .between("insertTime", start, end);
+ }
+
if (type!=null){
switch (type){
@@ -949,12 +1078,8 @@
BigDecimal driver = new BigDecimal("0");
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- if (tOrderPrivateCar.getDiscountMoney()==null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
- }
- if (tOrderPrivateCar.getState() != 8 && tOrderPrivateCar.getState()!=9){
- continue;
-
}
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
@@ -975,12 +1100,10 @@
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()));
@@ -1148,34 +1271,68 @@
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-// .eq("state", 8)
-// .or()
-// .eq("state", 9)
+
;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-// .eq("state", 8)
-// .or()
-// .eq("state", 9)
+
;
// 优惠券领取记录wrapper
Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
- .ne("couponUseType", 2)
- .ne("couponUseType", 3)
- .between("insertTime", start, end);
+ ;
// 红包领取记录wrapper
Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
- .ne("orderType", 2)
- .ne("orderType", 3)
- .between("insertTime", start, end);
+ ;
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
- .eq("carryOut", 2)
- .between("insertTime", start, end);
+ ;
+ if (time == 5 && insertTime==null){
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ ;
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ ;
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ ;
+ }else{
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end)
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .between("insertTime", start, end)
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ .between("insertTime", start, end);
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ .between("insertTime", start, end);
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ .between("insertTime", start, end);
+ }
if (type!=null){
switch (type){
--
Gitblit v1.7.1