From 4ff5f35054ab141d915c11ad878d4dcffe7e034a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 五月 2023 18:43:27 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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..d0bb555 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
@@ -15,9 +15,11 @@
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TDriverWork;
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.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -79,6 +81,10 @@
private HttpUtils httpUtils;
@Autowired
private TokenUtils tokenUtils;
+ @Autowired
+ private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private RedisUtil redisUtil;
@Autowired
private ITRechargeRecordService tRechargeRecordService;
@@ -351,6 +357,18 @@
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 {
+ tDriverCommissionResp.setLevel("二级");
+ }
+ }else {
+ tDriverCommissionResp.setLevel("一级");
+ }
+
}
}
return commissionResp;
@@ -459,6 +477,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);
--
Gitblit v1.7.1