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 | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 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 34d571b..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 @@ -2,6 +2,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.ArrayList; import java.util.Date; @@ -38,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; @@ -2799,4 +2801,119 @@ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO); return R.ok(loginUserInfoVO); } + + /** + * 微商业街新增商家账号 + * @param mcsMerchantDTO + * @return 商家用户id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R addMcsMerchantUser(McsMerchantDTO mcsMerchantDTO) { + SysUserDO sysUserDO; + sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda() + .eq(SysUserDO::getAccount, mcsMerchantDTO.getAccount()).eq(SysUserDO::getType, 11)); + if (nonNull(sysUserDO)) { + return R.fail("账户已经存在"); + } + // sys_user 表 + sysUserDO = new SysUserDO(); + BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO); + sysUserDO.setAccount(mcsMerchantDTO.getAccount()); + sysUserDO.setType(11); + sysUserDO.setAreaId(null); + sysUserDO.setStatus(mcsMerchantDTO.getAccountStatus()); + sysUserDO.setPhone(mcsMerchantDTO.getPhone()); + sysUserDO.setPassword(mcsMerchantDTO.getPassword()); + try { + userDao.insert(sysUserDO); + LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO(); + BeanUtils.copyProperties(sysUserDO, loginUserInfoVO); + return R.ok(loginUserInfoVO); + } catch (Exception e) { + e.printStackTrace(); + log.error("修改数字商业街商家用户报错【{}】", e.getMessage()); + if (e.getMessage().contains("union_phone_type")) { + return R.fail("手机号已存在"); + } else if (e.getMessage().contains("union_account_type")) { + return R.fail("账户已经存在"); + }else if(e.getMessage().contains("23000")){ + return R.fail("手机号已存在"); + } else { + return R.fail("账户或手机号已存在,请重新填写尝试"); + } + } + } + + /** + * 微商业街修改商家账号 + * @param mcsMerchantDTO + * @return + */ + @Override + public R putMcsMerchantUser(McsMerchantDTO mcsMerchantDTO) { + SysUserDO sysUserDO = userDao.selectById(mcsMerchantDTO.getUserId()); + if (isNull(sysUserDO)) { + return R.fail("用户不存在"); + } + String account = mcsMerchantDTO.getAccount(); + String phone = mcsMerchantDTO.getPhone(); + Integer accountStatus = mcsMerchantDTO.getAccountStatus(); + if (isNotBlank(account)) { + sysUserDO.setAccount(account); + } + if (isNotBlank(phone)) { + sysUserDO.setPhone(phone); + } + if (nonNull(accountStatus)) { + sysUserDO.setStatus(accountStatus); + } + try { + userDao.updateById(sysUserDO); + } catch (Exception e) { + e.printStackTrace(); + log.error("修改数字商业街商家用户报错【{}】", e.getMessage()); + if (e.getMessage().contains("union_phone_type")) { + return R.fail("手机号已存在"); + } else if (e.getMessage().contains("union_account_type")) { + return R.fail("账户已经存在"); + }else if(e.getMessage().contains("23000")){ + return R.fail("手机号已存在"); + } else { + return R.fail("账户或手机号已存在,请重新填写尝试"); + } + } + return R.ok(); + } + + /** + * 检查用户是否有效 + * @param userId + * @param type + * @return + */ + @Override + public Boolean checkUserIsValid(Long userId, Integer type) { + SysUserDO sysUserDO = userDao.selectById(userId); + if (isNull(sysUserDO) || sysUserDO.getStatus() != 1 || !sysUserDO.getType().equals(type)) { + return false; + } + 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