From e090805989dd874b06fa6f784a805008eff081e1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 五月 2023 18:46:20 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 126 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 32 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index d0bb555..f1bc1a1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.log.LogObjectHolder;
@@ -19,6 +20,7 @@
import com.stylefeng.guns.modular.system.model.TRechargeRecord;
import com.stylefeng.guns.modular.system.model.TRegion;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -47,6 +49,9 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -215,8 +220,8 @@
* 佣金跳转详情页面
*/
@RequestMapping("/commission/driverCommissionDetail")
- public String driverCommissionDetail(Integer tDriverId, Model model) {
- tDriverService.driverCommissionDetail(tDriverId,model);
+ public String driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model) {
+ tDriverService.driverCommissionDetail(tDriverId,levelFlag,model);
return PREFIX + "tDriverCommissionDetail.html";
}
@@ -308,10 +313,33 @@
@ResponseBody
public Object list(String createTime,String phone,Integer status) {
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
- wrapper.ne("isException",2);
wrapper.orderBy("createTime",false);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
- return tDriverService.getTDriverResp(tDrivers);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
+ for (TDriverResp driverResp : tDriverResp) {
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driverResp.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 1){
+ driverResp.setNotOnlineCount(0);
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }else {
+ if(Objects.nonNull(driverResp.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }else {
+ driverResp.setNotOnlineCount(0);
+ }
+ }
+ }
+ return tDriverResp;
}
/**
* 获取佣金列表
@@ -321,7 +349,11 @@
public Object commissionList(String name,String phone,Integer status) {
EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
- return tDriverService.getTDriverCommissionResp(tDrivers);
+ List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(tDrivers);
+ for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
+ tDriverCommissionResp.setLevelFlag(0);
+ }
+ return commissionResp;
}
/**
* 获取异常列表
@@ -341,8 +373,7 @@
*/
@RequestMapping(value = "/commission/connect/list")
@ResponseBody
- public Object commissionConnectList(String driverId) {
-
+ public Object commissionConnectList(String driverId,Integer levelFlag) {
// 查询当前用户的用户信息
TDriver tDriver = tDriverService.selectById(driverId);
@@ -352,24 +383,30 @@
}
wrapper.orderBy("createTime",false);
List<TDriver> list = tDriverService.selectList(wrapper);
- List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(list);
- for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
- if(Objects.nonNull(tDriver)){
- tDriverCommissionResp.setInviterName(tDriver.getName());
- tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
-
- if(Objects.nonNull(tDriver.getInviterId())){
- TDriver driver = tDriverService.selectById(tDriver.getInviterId());
- if(Objects.nonNull(driver.getInviterId())){
- tDriverCommissionResp.setLevel("三级");
- }else {
+ List<TDriverCommissionResp> commissionResp = new ArrayList<>();
+ try{
+ commissionResp = tDriverService.getTDriverCommissionResp(list);
+ for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
+ if(Objects.nonNull(tDriver)){
+ tDriverCommissionResp.setInviterName(tDriver.getName());
+ tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
+ if(levelFlag == 0){
+ tDriverCommissionResp.setLevelFlag(1);
+ tDriverCommissionResp.setLevel("一级");
+ }
+ if(levelFlag == 1){
+ tDriverCommissionResp.setLevelFlag(2);
tDriverCommissionResp.setLevel("二级");
}
- }else {
- tDriverCommissionResp.setLevel("一级");
- }
+ if(levelFlag == 2){
+ tDriverCommissionResp.setLevelFlag(3);
+ tDriverCommissionResp.setLevel("三级");
+ }
+ }
}
+ }catch (Exception e){
+ e.printStackTrace();
}
return commissionResp;
}
@@ -589,12 +626,11 @@
String time1 = format.format(date);
String fileName = "DriverInfo"+time1+".xls";
String[] title = new String[] {"编号","姓名","手机号","性别","驾驶证号码","身份证号码",
- "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","添加时间"};
+ "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","审核状态","添加时间"};
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
- // 是否异常
- List<TDriver> list = tDriverService.selectList(wrapper);
-
- List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
+ wrapper.orderBy("createTime",false);
+ List<TDriver> tDrivers = tDriverService.selectList(wrapper);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
String[][] values = new String[tDriverResp.size()][];
for (int i = 0; i < tDriverResp.size(); i++) {
@@ -633,7 +669,15 @@
}else {
values[i][14] = "删除";
}
- values[i][15] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
+ Integer approvalStatus = d.getApprovalStatus();
+ if(1 == approvalStatus){
+ values[i][15] = "待审核";
+ }else if(2 == approvalStatus){
+ values[i][15] = "已同意";
+ }else {
+ values[i][15] = "已拒绝";
+ }
+ values[i][16] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
}
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
ExcelUtil.setResponseHeader(response, fileName);
@@ -662,10 +706,28 @@
"身份证","累计订单量","当月订单量","积分","连续未上线（天）","状态","添加时间"};
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
wrapper.eq("isException",2);
- // 是否异常
- List<TDriver> list = tDriverService.selectList(wrapper);
-
- List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
+ wrapper.orderBy("createTime",false);
+ List<TDriver> tDrivers = tDriverService.selectList(wrapper);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
+ for (TDriverResp driverResp : tDriverResp) {
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driverResp.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 1){
+ driverResp.setNotOnlineCount(0);
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }else {
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }
String[][] values = new String[tDriverResp.size()][];
for (int i = 0; i < tDriverResp.size(); i++) {
@@ -706,7 +768,7 @@
e.printStackTrace();
}
}
- @ApiOperation(value = "导出司机异常列表",notes="导出司机异常列表")
+ @ApiOperation(value = "导出司机佣金列表",notes="导出司机佣金列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
--
Gitblit v1.7.1