From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
index 0bca408..7ebd975 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
@@ -55,7 +55,7 @@
@Override
public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
pageNum = (pageNum - 1) * pageSize;
- Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("type", 2).eq("userType", 2)
+ Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("userType", 2)
.eq("userId", driverId);
if(ToolUtil.isNotEmpty(time)){
wrapper.eq("DATE_FORMAT(createTime, '%Y年%m月')", time);
@@ -66,20 +66,7 @@
CommissionListWarpper commissionListWarpper = new CommissionListWarpper();
commissionListWarpper.setCreateTime(revenue.getCreateTime().getTime());
commissionListWarpper.setAmount(revenue.getAmount());
- commissionListWarpper.setUserType(2);
- Order order = orderService.selectById(revenue.getOrderId());
- if(null != order.getUserId()){
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && appUser.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(1);
- }
- }
- if(null == commissionListWarpper.getUserType()){
- Driver driver = driverService.selectById(order.getDriverId());
- if(null != driver.getInviterType() && driver.getInviterType() == 2 && driver.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(2);
- }
- }
+ commissionListWarpper.setUserType(revenue.getType());
list.add(commissionListWarpper);
}
return list;
--
Gitblit v1.7.1