From 55402cc48ecee2ac135624db4d31119b459a1be7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 15:59:51 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..82d2a14 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
@@ -2822,13 +2822,22 @@
public R addMcsMerchantUser(McsMerchantDTO mcsMerchantDTO) {
SysUserDO sysUserDO;
sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda()
- .eq(SysUserDO::getAccount, mcsMerchantDTO.getAccount()).eq(SysUserDO::getType, 11));
+ .eq(SysUserDO::getPhone, mcsMerchantDTO.getPhone()).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);
}
@@ -2879,6 +2889,9 @@
}
if (nonNull(accountStatus)) {
sysUserDO.setStatus(accountStatus);
+ }
+ if (isNotBlank(name)) {
+ sysUserDO.setName(name);
}
try {
userDao.updateById(sysUserDO);
@@ -2974,7 +2987,7 @@
public R getMcsUserByOpenId(String openid) {
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid).eq(SysUserDO::getType, 11));
McsLoginUserInfoVO loginUserInfoVO = null;
- if (nonNull(sysUserDO)) {
+ if (nonNull(sysUserDO) && isNotBlank(sysUserDO.getOpenid())) {
loginUserInfoVO = new McsLoginUserInfoVO();
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
}
--
Gitblit v1.7.1