From 04ce420613f90f8414e87e8fe68484fc32485349 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 24 六月 2025 18:49:06 +0800
Subject: [PATCH] 部署
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index b1031a1..d71fa38 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -134,7 +134,12 @@
appUser.setWxOpenid(openid);
appUser.setStatus(1);
appUser.setDelFlag(false);
+ appUser.setCreateTime(LocalDateTime.now());
this.save(appUser);
+ }else {
+ //从订单导入的，将openid导入
+ appUser.setWxOpenid(openid);
+ this.updateById(appUser);
}
//账户被冻结，给出提示
if(2 == appUser.getStatus()){
@@ -174,7 +179,7 @@
//查询用户是否注册，没有注册则跳转到注册页面
AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, mobileLogin.getPhone())
.ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
- if(null == appUser){
+ if(null == appUser||null ==appUser.getWxOpenid()){
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(2);
loginVo.setPhone(mobileLogin.getPhone());
@@ -304,7 +309,7 @@
return R.fail("手机号已注册，请直接登录！");
}
if(null != appUser1 && appUser1.getStatus() == 2){
- return R.fail("手机号已注册，请直接登录！");
+ return R.fail("该手机号已被冻结！");
}
String avatar = registerAccount.getAvatar();
--
Gitblit v1.7.1