From 8cc3c660bdaaaa6a46eecadb78e4e9c17a07c227 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 五月 2022 18:57:06 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
index 3294f24..146760e 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
@@ -206,23 +206,23 @@
@UserLogin(uid = "#uid")
@ResponseBody
@RequestMapping("unRegister")
- public String unRegister(AcceptData acceptData, String vcode, String phone) {
+ public String unRegister(AcceptData acceptData, Long uid) {
- if (StringUtil.isNullOrEmpty(vcode)) {
- return JsonUtil.loadFalseResult("楠岃瘉鐮佷笉鑳戒负绌�");
- }
+// if (StringUtil.isNullOrEmpty(vcode)) {
+// return JsonUtil.loadFalseResult("楠岃瘉鐮佷笉鑳戒负绌�");
+// }
+//
+// if (StringUtil.isNullOrEmpty(phone)) {
+// return JsonUtil.loadFalseResult("鎵嬫満鍙蜂笉鑳戒负绌�");
+// }
+//
+// if (!verifyCodeManager.isPhoneCodeRight(acceptData.getSystem(), phone, vcode)) {
+// return JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇�");
+// }
- if (StringUtil.isNullOrEmpty(phone)) {
- return JsonUtil.loadFalseResult("鎵嬫満鍙蜂笉鑳戒负绌�");
- }
-
- if (!verifyCodeManager.isPhoneCodeRight(acceptData.getSystem(), phone, vcode)) {
- return JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇�");
- }
-
- UserInfo user = userInfoService.selectValidByPhone(acceptData.getSystem(), phone);
+ UserInfo user = userInfoService.getAvaiableUser(uid);
if (user == null) {
- return JsonUtil.loadFalseResult("涓嶅瓨鍦ㄧ粦瀹氳鎵嬫満鍙风殑鐢ㄦ埛");
+ return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦ㄦ垨鐢ㄦ埛宸茶灏佺");
}
//娉ㄩ攢
userAccountService.unRegister(user.getId());
@@ -318,11 +318,10 @@
pushManager.saveToken(acceptData, uid, regId);
return JsonUtil.loadTrueResult("");
} catch (BPushDeviceTokenException e) {
- return JsonUtil.loadTrueResult("涓氬姟鍑洪敊");
+ return JsonUtil.loadFalseResult(e.getCode(), "涓氬姟鍑洪敊");
} catch (ParamsException e) {
- return JsonUtil.loadTrueResult("鍙傛暟閿欒");
+ return JsonUtil.loadFalseResult(e.getCode(), "鍙傛暟閿欒");
}
-
}
/**
--
Gitblit v1.8.0