From 04ae1bf1c6b3f0498dfd180275a6d4255a8dce5e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 五月 2023 15:14:24 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 04833ee..39c2621 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -98,6 +98,9 @@
@Autowired
private RongYunUtil rongYunUtil;
+ @Autowired
+ private PushUtil pushUtil;
+
/**
@@ -162,7 +165,10 @@
String code = driverRegisterWarpper.getCode();
BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("districtCode", code).eq("status", 1));
if(null == branchOffice){
- throw new Exception("该区域无服务商");
+ branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("cityCode", code).eq("status", 1));
+ if(null == branchOffice){
+ throw new Exception("该区域无服务商");
+ }
}
driver.setBranchOfficeId(branchOffice.getId());
driver.setAgentId(branchOffice.getAgentId());
@@ -313,13 +319,21 @@
usernamePasswordToken, simpleAuthenticationInfo);
if (passwordTrueFlag) {
- String token = JwtTokenUtil.generateToken(phone);
+ String token = JwtTokenUtil.generateToken(phone + System.currentTimeMillis());
String key = token;
if(token.length() > 16){
key = token.substring(token.length() - 16);
}
redisUtil.setStrValue(key, driver.getId().toString(), 7 * 24 * 60 * 60);//7天
redisUtil.setStrValue("DRIVER_" + phone, key, 7 * 24 * 60 * 60);//7天
+
+ //下线
+ for (int i = 0; i < 5; i++) {
+ Integer code = pushUtil.pushOffline(driver.getId(), 2);
+ if(200 == code){
+ break;
+ }
+ }
return token;
}
return "";
@@ -545,8 +559,8 @@
Driver driver = this.selectById(uid);
DriverInfoWarpper driverInfo = new DriverInfoWarpper();
BeanUtils.copyProperties(driver, driverInfo);
- driverInfo.setBalance(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
driverInfo.setWithdrawBalance(driver.getBalance());
+ driverInfo.setBalance(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
YouTuiDriver youTuiDriver = youTuiDriverService.selectOne(new EntityWrapper<YouTuiDriver>().eq("driverId", uid)
.eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
if(null != youTuiDriver){
@@ -707,9 +721,9 @@
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driver1.setBalance(driver1.getBalance() + amount);
- accountChangeDetail.setNewData(driver1.getBalance());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
DriverServiceImpl.this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -760,9 +774,9 @@
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driver1.setBalance(driver1.getBalance() + rechargeRecord1.getAmount());
- accountChangeDetail.setNewData(driver1.getBalance());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
--
Gitblit v1.7.1