|
@@ -100,7 +100,7 @@ public class StoreUserController {
|
|
|
return R.fail("当验证码过期或未发送");
|
|
return R.fail("当验证码过期或未发送");
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isBlank(oldPassword) && !cacheCode.trim().equals(verificationCode.trim())) {
|
|
if (StringUtils.isBlank(oldPassword) && !cacheCode.trim().equals(verificationCode.trim())) {
|
|
|
- return R.fail("验证码错误");
|
|
|
|
|
|
|
+ return R.fail("验证码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
return storeUserService.forgetOrModifyPassword(phone, newPhone, oldPassword, newPassword, confirmNewPassword, verificationCode, type);
|
|
return storeUserService.forgetOrModifyPassword(phone, newPhone, oldPassword, newPassword, confirmNewPassword, verificationCode, type);
|
|
|
}
|
|
}
|
|
@@ -117,7 +117,7 @@ public class StoreUserController {
|
|
|
return R.fail("当验证码过期或未发送");
|
|
return R.fail("当验证码过期或未发送");
|
|
|
}
|
|
}
|
|
|
if (!cacheCode.trim().equals(verificationCode.trim())) {
|
|
if (!cacheCode.trim().equals(verificationCode.trim())) {
|
|
|
- return R.fail("验证码错误");
|
|
|
|
|
|
|
+ return R.fail("验证码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
try {
|
|
try {
|
|
|
return R.data(storeUserService.changePhoneVerification(phone, oldPassword, verificationCode));
|
|
return R.data(storeUserService.changePhoneVerification(phone, oldPassword, verificationCode));
|
|
@@ -331,7 +331,7 @@ public class StoreUserController {
|
|
|
return R.fail("当验证码过期或未发送");
|
|
return R.fail("当验证码过期或未发送");
|
|
|
}
|
|
}
|
|
|
if (!cacheCode.trim().equals(code.trim())) {
|
|
if (!cacheCode.trim().equals(code.trim())) {
|
|
|
- return R.fail("验证码错误");
|
|
|
|
|
|
|
+ return R.fail("验证码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
log.info("StoreUserController.register?phone={}&password={}", phone, password);
|
|
log.info("StoreUserController.register?phone={}&password={}", phone, password);
|
|
|
return storeUserService.register(phone, password);
|
|
return storeUserService.register(phone, password);
|
|
@@ -393,7 +393,7 @@ public class StoreUserController {
|
|
|
return R.fail("当验证码过期或未发送");
|
|
return R.fail("当验证码过期或未发送");
|
|
|
}
|
|
}
|
|
|
if (!cacheCode.trim().equals(storeUserVo.getVerificationCode().trim())) {
|
|
if (!cacheCode.trim().equals(storeUserVo.getVerificationCode().trim())) {
|
|
|
- return R.fail("验证码错误");
|
|
|
|
|
|
|
+ return R.fail("验证码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
try {
|
|
try {
|
|
|
storeUserService.storeCancelAccount(storeUserVo);
|
|
storeUserService.storeCancelAccount(storeUserVo);
|