From 1e28ac69827ff7578a418a79bd95aff2c6637f5c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 28 六月 2020 16:47:00 +0800
Subject: [PATCH] 2.1.3
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index dd0b380..94b2cdd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -25,11 +25,13 @@
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
+import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
@@ -86,6 +88,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -293,6 +296,13 @@
object.put("code", errorCode);
object.put("data", data);
out.print(object.toString());
+ } else if (errorCode == 102) { // 闇�瑕佺粦瀹氬井淇″彿
+ JSONObject data = new JSONObject();
+ data.put("key", e.getMsg());
+ JSONObject object = new JSONObject();
+ object.put("code", errorCode);
+ object.put("data", data);
+ out.print(object.toString());
} else {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
try {
@@ -370,6 +380,50 @@
}
}
+
+
+ /**
+ * 缁戝畾寰俊V2.1.3 鐢佃瘽鍙风爜 鐧诲綍
+ *
+ * @param acceptData
+ * @param vcode
+ * @param phone
+ * @param out
+ */
+ @RequestSerializableByKey(key = "'bindWXLogin-'+#code")
+ @RequestMapping(value = "bindWXLogin")
+ public void bindWXLogin(AcceptData acceptData, Long uid, String code, String key, HttpServletRequest request,
+ PrintWriter out) {
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(code)) {
+ out.print(JsonUtil.loadFalseResult("璇蜂笂浼燾ode"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(key)) {
+ out.print(JsonUtil.loadFalseResult("key鍊间笉鑳戒负绌�"));
+ return;
+ }
+
+ try {
+ UserInfo userInfo = userAccountService.bindWXToLogin(request, acceptData, code, system.getAppid(), key);
+ JSONObject data = new JSONObject();
+ data.put("userInfo", UserUtil.filterForClientUser(userInfo));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (UserAccountException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
+
+ }
+
+
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -815,4 +869,62 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+
+ /**
+ * 璐︽埛娉ㄩ攢
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping("accountRemove")
+ public void accountRemove(AcceptData acceptData, String callback, Long uid, String vcode, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(vcode)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇疯緭鍏ラ獙璇佺爜"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (userInfo.getState() == UserInfo.STATE_FORBIDDEN) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
+ if (userInfo.getState() == UserInfo.STATE_DELETE || userInfo.getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, "甯愭埛宸茶娉ㄩ攢锛岃閲嶆柊鐧诲綍"));
+ return;
+ }
+
+ String phone = userInfo.getPhone();
+ if (StringUtil.isNullOrEmpty(phone)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈粦瀹氭湁鏁堢數璇濆彿鐮�"));
+ return;
+ }
+
+ if (!Constant.IS_TEST) {
+ String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_REMVOE);
+ if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆"));
+ return;
+ }
+ redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);
+ }
+
+ UserInfo user = new UserInfo(uid);
+ user.setState(UserInfo.STATE_DELETE);
+ user.setStateDesc("鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
+ userInfoService.updateByPrimaryKeySelective(user);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娉ㄩ攢鎴愬姛"));
+ }
+
}
--
Gitblit v1.8.0