From 03cf90fca0d530d295cdfcd717e8473bd1d347ec Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 13 一月 2022 17:49:59 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index f770fef..7018d27 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2823,12 +2823,21 @@
SysUserDO sysUserDO;
sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda()
.eq(SysUserDO::getAccount, mcsMerchantDTO.getAccount()).eq(SysUserDO::getType, 11));
+ String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword());
if (nonNull(sysUserDO)) {
- return R.fail("账户已经存在");
+ BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO);
+ sysUserDO.setAccount(mcsMerchantDTO.getAccount());
+ sysUserDO.setStatus(mcsMerchantDTO.getAccountStatus());
+ sysUserDO.setPhone(mcsMerchantDTO.getPhone());
+ sysUserDO.setPassword(encode);
+ sysUserDO.setPlaintextPassword(mcsMerchantDTO.getPassword());
+ userDao.updateById(sysUserDO);
+ McsLoginUserInfoVO loginUserInfoVO = new McsLoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ return R.ok(loginUserInfoVO);
}
// sys_user 表
sysUserDO = new SysUserDO();
- String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword());
BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO);
sysUserDO.setAccount(mcsMerchantDTO.getAccount());
sysUserDO.setType(11);
@@ -2871,6 +2880,7 @@
String account = mcsMerchantDTO.getAccount();
String phone = mcsMerchantDTO.getPhone();
Integer accountStatus = mcsMerchantDTO.getAccountStatus();
+ String name = mcsMerchantDTO.getName();
if (isNotBlank(account)) {
sysUserDO.setAccount(account);
}
@@ -2880,6 +2890,9 @@
if (nonNull(accountStatus)) {
sysUserDO.setStatus(accountStatus);
}
+ if (isNotBlank(name)) {
+ sysUserDO.setName(name);
+ }
try {
userDao.updateById(sysUserDO);
} catch (Exception e) {
--
Gitblit v1.7.1