From adf76f841a890299a4c68826b3b1716f69351dd1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 09 八月 2023 19:32:16 +0800
Subject: [PATCH] 修改bug和日志时间
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 274 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 230 insertions(+), 44 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 2ed33c1..4c6f5ce 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
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSON;
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;
@@ -13,11 +15,12 @@
import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.controller.util.TokenUtils;
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
+import com.stylefeng.guns.modular.system.dao.AccountChangeDetailMapper;
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
-import com.stylefeng.guns.modular.system.model.TDriver;
-import com.stylefeng.guns.modular.system.model.TRechargeRecord;
-import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.model.*;
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;
import io.swagger.annotations.ApiOperation;
@@ -28,6 +31,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
@@ -38,13 +42,18 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
+import java.text.ParseException;
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;
@@ -80,7 +89,17 @@
@Autowired
private TokenUtils tokenUtils;
@Autowired
+ private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
private ITRechargeRecordService tRechargeRecordService;
+
+ @Autowired
+ private ITSystemConfigService systemConfigService;
+
+ @Resource
+ private AccountChangeDetailMapper accountChangeDetailMapper;
private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -112,10 +131,17 @@
* 跳转到修改
*/
@RequestMapping("/tDriver_update")
- public String tDriverUpdate( Integer tDriverId, Model model) {
+ public String tDriverUpdate( Integer tDriverId, Model model) throws ParseException {
TDriver tDriver = tDriverService.selectById(tDriverId);
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
+
+ if(Objects.nonNull(tDriverResp.getFirstCertificateTime())){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String format1 = format.format(tDriverResp.getFirstCertificateTime());
+ tDriverResp.setFirstCertificateTimeStr(format1);
+ }
+// tDriverResp.setFirstCertificateTime(format.parse(format1));
// 查询邀请人
TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
@@ -130,9 +156,22 @@
TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tDriver.getCityCode())
.last("LIMIT 1"));
- tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
- if(Objects.nonNull(district) && Objects.nonNull(city)){
- tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+// if(Objects.nonNull(district) && Objects.nonNull(city)){
+// tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// }
+ if(StringUtils.hasLength(tDriver.getAreaName()) && !tDriver.getAreaName().equals(tDriver.getCityName())){
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+ }else {
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName());
+ }
+
+ if(Objects.nonNull(city)){
+ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+ }else {
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId());
+ }
}
model.addAttribute("item",tDriverResp);
@@ -209,8 +248,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";
}
@@ -223,12 +262,20 @@
String[] split = area.split("/");
model.addAttribute("provinceName",split[0]);
model.addAttribute("cityName",split[1]);
- model.addAttribute("districtName",split[2]);
+ if(split.length>2){
+ model.addAttribute("districtName",split[2]);
+ }else {
+ model.addAttribute("districtName","");
+ }
String[] split1 = areaId.split("/");
model.addAttribute("provinceId",split1[0]);
model.addAttribute("cityId",split1[1]);
- model.addAttribute("districtId",split1[2]);
+ if(split1.length>2) {
+ model.addAttribute("districtId", split1[2]);
+ }else {
+ model.addAttribute("districtId", "");
+ }
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
@@ -242,7 +289,7 @@
// 查询区
List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
model.addAttribute("districtList",tRegions2);
return PREFIX + "tDriverAreaUpdate.html";
@@ -256,15 +303,15 @@
String[] split1 = areaId.split("/");
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
model.addAttribute("provinceList",tRegions);
- List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
- // 查询市
- List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
- model.addAttribute("cityList",tRegions1);
-
- // 查询区
- List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
- model.addAttribute("districtList",tRegions2);
+// List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+// // 查询市
+// List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+// model.addAttribute("cityList",tRegions1);
+//
+// // 查询区
+// List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+// List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+// model.addAttribute("districtList",tRegions2);
if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
String[] split = area.split("/");
@@ -283,7 +330,17 @@
}else {
model.addAttribute("districtId", "");
}
+
+ List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+ model.addAttribute("cityList",tRegions1);
+
+ // 查询区
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
+ model.addAttribute("districtList",tRegions2);
}else {
+ model.addAttribute("cityList",new ArrayList<>());
+ model.addAttribute("districtList",new ArrayList<>());
+
model.addAttribute("provinceName","");
model.addAttribute("cityName","split[1]");
model.addAttribute("districtName","");
@@ -302,10 +359,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(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }
+ }else {
+ if(Objects.nonNull(driverResp.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }else {
+ driverResp.setNotOnlineCount(0);
+ }
+ }
+ }
+ return tDriverResp;
}
/**
* 获取佣金列表
@@ -315,7 +395,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;
}
/**
* 获取异常列表
@@ -327,7 +411,31 @@
wrapper.eq("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(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }
+ }else {
+ if(Objects.nonNull(driverResp.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }else {
+ driverResp.setNotOnlineCount(0);
+ }
+ }
+ }
+ return tDriverResp;
}
/**
@@ -335,8 +443,7 @@
*/
@RequestMapping(value = "/commission/connect/list")
@ResponseBody
- public Object commissionConnectList(String driverId) {
-
+ public Object commissionConnectList(String driverId,Integer levelFlag) {
// 查询当前用户的用户信息
TDriver tDriver = tDriverService.selectById(driverId);
@@ -346,12 +453,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());
+ 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("二级");
+ }
+ if(levelFlag == 2){
+ tDriverCommissionResp.setLevelFlag(3);
+ tDriverCommissionResp.setLevel("三级");
+ }
+
+ }
}
+ }catch (Exception e){
+ e.printStackTrace();
}
return commissionResp;
}
@@ -410,6 +535,28 @@
tDriver.setApprovalUserId(shiroUser.getId());
tDriver.setApprovalTime(new Date());
tDriverService.updateById(tDriver);
+
+ //增加积分奖励
+ if(approvalStatus == 2 && null != tDriver.getInviterId()){
+ TSystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 4));
+ Integer num7 = JSON.parseObject(systemConfig.getContent()).getInteger("num7");
+ TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(tDriver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(10);
+ accountChangeDetail.setOldData(tDriver1.getIntegral().doubleValue());
+ tDriver1.setIntegral(tDriver1.getIntegral() + num7);
+ accountChangeDetail.setNewData(tDriver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("推荐奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetailMapper.insert(accountChangeDetail);
+ tDriverService.updateById(tDriver1);
+ }
+
return SUCCESS_TIP;
}
@@ -459,6 +606,19 @@
TDriver tDriver = tDriverService.selectById(id);
if(1 == status){
tDriver.setStatus(2);
+ String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(value);
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", tDriver.getId())
+ .eq("status", 1)
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ tDriverWork.setStatus(2);
+ tDriverWork.setOffWorkTime(new Date());
+ tDriverWorkService.updateById(tDriverWork);
+ }
}
if(2 == status){
tDriver.setStatus(1);
@@ -490,7 +650,8 @@
tRechargeRecord.setPayTime(new Date());
tRechargeRecord.setPayStatus(2);
tRechargeRecord.setCreateTime(new Date());
- tRechargeRecord.setAgentId(Objects.requireNonNull(ShiroKit.getUser()).getId());
+ Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ tRechargeRecord.setAgentId(id1);
tRechargeRecordService.insert(tRechargeRecord);
return SUCCESS_TIP;
}
@@ -558,12 +719,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++) {
@@ -602,7 +762,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);
@@ -631,10 +799,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++) {
@@ -675,7 +861,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