From 151d70eba459a86218a18c679adafa0a865d3a98 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 四月 2024 15:02:28 +0800
Subject: [PATCH] 修改用户密码登录、忘记密码提示语
---
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
index cc9fc5b..a688b2b 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
@@ -1,6 +1,7 @@
package com.sinata.rest.modular.member.controller;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -233,7 +234,7 @@
wrapper.eq(MemUser::getPhone, phone);
MemUser user = userService.getOne(wrapper);
if (user == null) {
- return ApiUtils.returnNG(null, "帐号或密码错误");
+ return ApiUtils.returnNG(null, "手机号不存在，请注册");
}
if (1 == user.getIsLock()) {
return ApiUtils.returnNG(null, "您帐号已被锁定");
@@ -270,6 +271,16 @@
user.setNickName(info.nickname);
user.setSex(info.gender);
user.setBirthday(info.birthday);
+ if (StrUtil.isNotBlank(info.getCityCode())) {
+ String province = StrUtil.sub(info.getCityCode(), 0, 2) + "0000";
+ String city = StrUtil.sub(info.getCityCode(), 0, 4) + "00";
+ String county = info.getCityCode();
+
+ user.setCityCode(info.getCityCode());
+ user.setAgentProvinceCode(province);
+ user.setAgentCityCode(city);
+ user.setAgentCountyCode(county);
+ }
// user.setSignature(info.signature);
// user.setAddress(info.address);
userService.saveOrUpdate(user);
--
Gitblit v1.7.1