From 176a83fedd71847a088bafb541b9a8877d6234b7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 14:26:52 +0800
Subject: [PATCH] 增加订单解析配置信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index 28434e3..a995194 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.LoginResult;
-import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserConnectHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -41,6 +40,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -83,6 +83,9 @@
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@Transactional
@Override
@@ -909,22 +912,22 @@
}
phone = phone.replaceAll(" ", "");
- // 鑻规灉搴旂敤鍟嗗簵涓婄嚎娴嬭瘯鍙风爜
- if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {
- ;
- } else {
-
- if (StringUtil.isNullOrEmpty(vcode)) {
- throw new UserAccountException(1, "璇疯緭鍏ラ獙璇佺爜");
- }
-
- String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);
- LogHelper.test("----------------------鐧诲綍楠岃瘉鐮侊細 " + oldVcode);
- if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
- throw new UserAccountException(1, "楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆");
- }
- }
- redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);
+// // 鑻规灉搴旂敤鍟嗗簵涓婄嚎娴嬭瘯鍙风爜
+// if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {
+// ;
+// } else {
+//
+// if (StringUtil.isNullOrEmpty(vcode)) {
+// throw new UserAccountException(1, "璇疯緭鍏ラ獙璇佺爜");
+// }
+//
+// String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);
+// LogHelper.test("----------------------鐧诲綍楠岃瘉鐮侊細 " + oldVcode);
+// if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
+// throw new UserAccountException(1, "楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆");
+// }
+// }
+// redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);
JSONObject logInfo = new JSONObject();
logInfo.put("appId", appId);
@@ -954,6 +957,14 @@
userInfo.setState(UserInfo.STATE_NORMAL);
// 鍒涘缓鐢ㄦ埛
addUser(userInfo);
+
+
+ try {
+ // 绗竴娆＄櫥褰曟椂鍒涘缓鐢ㄦ埛棰濆淇℃伅
+ userInfoExtraService.createUserInfoExtra(userInfo.getId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
return userInfo;
@@ -1003,6 +1014,13 @@
userInfo.setLastLoginIp(request.getRemoteHost());
userInfo.setState(UserInfo.STATE_NORMAL);
addUser(userInfo);
+
+ try {
+ // 绗竴娆＄櫥褰曟椂鍒涘缓鐢ㄦ埛棰濆淇℃伅
+ userInfoExtraService.createUserInfoExtra(userInfo.getId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
return userInfo;
}
--
Gitblit v1.8.0