From 9a12466b7a4bb0ad16e1fb4374b769be71dd2bcb Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 06 一月 2022 18:23:56 +0800
Subject: [PATCH] 商业街H5登录
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 1ac82ba..72a70d3 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
@@ -14,9 +14,7 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import javax.validation.constraints.NotBlank;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -41,6 +39,7 @@
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditAdminDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
@@ -2819,17 +2818,18 @@
}
// sys_user 表
sysUserDO = new SysUserDO();
- String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword());
BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO);
sysUserDO.setAccount(mcsMerchantDTO.getAccount());
sysUserDO.setType(11);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(mcsMerchantDTO.getAccountStatus());
sysUserDO.setPhone(mcsMerchantDTO.getPhone());
- sysUserDO.setPassword(encode);
+ sysUserDO.setPassword(mcsMerchantDTO.getPassword());
try {
userDao.insert(sysUserDO);
- return R.ok(sysUserDO.getUserId());
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ return R.ok(loginUserInfoVO);
} catch (Exception e) {
e.printStackTrace();
log.error("修改数字商业街商家用户报错【{}】", e.getMessage());
@@ -2900,4 +2900,20 @@
}
return true;
}
+
+ /**
+ * 根据手机号、用户类型查询用户
+ * @param phone
+ * @param type
+ * @return
+ */
+ @Override
+ public R getSysUserByPhone(String phone, Integer type) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, type));
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ if (nonNull(sysUserDO)) {
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ }
+ return R.ok(loginUserInfoVO);
+ }
}
--
Gitblit v1.7.1