From ed79668a9a0d49f0f532c6e603a821eb508085bf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 三月 2023 09:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 e957afc..b6a8177 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
@@ -91,6 +91,9 @@
@Autowired
private IRechargeRecordService rechargeRecordService;
+ @Autowired
+ private IAgentService agentService;
+
/**
@@ -538,6 +541,8 @@
driverInfo.setOnline(second);
}
driverInfo.setWechatAuthorization(driver.getOpenid() == null ? 0 : 1);
+ Agent agent = agentService.selectById(driver.getAgentId());
+ driverInfo.setServiceCalls(agent.getServiceCalls());
return driverInfo;
}
@@ -733,4 +738,41 @@
rechargeRecord1.setOrderNumber(transaction_id);
rechargeRecordService.updateById(rechargeRecord1);
}
+
+
+ /**
+ * 修改密码
+ * @param uid
+ * @param oldPass
+ * @param newPass
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil updatePassword(Integer uid, String oldPass, String newPass) throws Exception {
+ Driver driver = this.selectById(uid);
+ if(!ShiroKit.md5(oldPass, salt).equals(driver.getPassword())){
+ return ResultUtil.error("原密码错误");
+ }
+ newPass = ShiroKit.md5(newPass, salt);
+ driver.setPassword(newPass);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
+
+ /**
+ * 设置密码
+ * @param uid
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil recoverPassword(Integer uid, String password) throws Exception {
+ Driver driver = this.selectById(uid);
+ password = ShiroKit.md5(password, salt);
+ driver.setPassword(password);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
}
--
Gitblit v1.7.1