From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index e34859e..a5925fe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -107,6 +107,7 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -226,16 +227,18 @@
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
-
+
@Resource
private BindRemindService bindRemindService;
-
+
@Resource
private RedPackBalanceService redPackBalanceService;
-
+
@Resource
private UserRankService userRankService;
-
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -282,7 +285,7 @@
userActiveLog.setOsVersion(acceptData.getOsVersion());
userActiveLog.setDeviceType(acceptData.getDeviceType());
userActiveLog.setDevice(acceptData.getDevice());
-
+
userActiveLogService.addUserActiveLog(userActiveLog);
outUserInfo(acceptData, out, remotIP, find, acceptData.getDevice());
@@ -2166,32 +2169,43 @@
// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
-
+
+ // 鏌ヨ鏄惁涓篤IP
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ userInfo.setVip(userVIPInfoService.isVIP(uid));
+ }
+
data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
data.put("invitCode", invitCode); // 閭�璇风爜
+ if (userInfoExtra.getInviteCodeState() != null
+ && userInfoExtra.getInviteCodeState() == UserInfoExtra.INVITE_CODE_SATTE_VALID_UPDATED)
+ data.put("invitCodeUpdated", true);// 閭�璇风爜鏄惁宸茬粡淇敼杩�
+ else
+ data.put("invitCodeUpdated", false);
data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
-
+ data.put("vipLink", configService.get("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
+
// 2.0.1涔嬪悗缁戝畾鎵嬫満鍙�
if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
boolean bindPhone = false;
- if (StringUtil.isNullOrEmpty(userInfo.getPhone()))
+ if (StringUtil.isNullOrEmpty(userInfo.getPhone()))
bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
data.put("bindPhone", bindPhone);
}
-
+
// 2.0.2 鐗堟湰
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
- if (redPackBalance != null && redPackBalance.getState() != null &&
- redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
+ if (redPackBalance != null && redPackBalance.getState() != null
+ && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
data.put("redPackLock", RedPackBalance.STATE_LOCKED);
} else {
data.put("redPackLock", RedPackBalance.STATE_INIT);
}
}
-
+
out.print(JsonUtil.loadTrueResult(data));
-
+
final UserInfo uuser = userInfo;
ThreadUtil.run(new Runnable() {
public void run() {
@@ -2306,7 +2320,7 @@
*/
@RequestMapping(value = "saveInfo")
public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
- PrintWriter out) {
+ String inviteCode, PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -2359,6 +2373,28 @@
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");
}
}
+
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
+ inviteCode = inviteCode.trim();
+ if (inviteCode.length() >= 6 && inviteCode.length() <= 12) {
+
+ if (!userVIPInfoService.isVIP(uid)) {
+ out.print(JsonUtil.loadFalseResult(20, "鍙湁瓒呯骇浼氬憳鎵嶈兘淇敼"));
+ return;
+ }
+
+ try {
+ userInfoExtraService.updateInviteCode(inviteCode, uid);
+ out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ return;
+ } catch (UserInfoExtraException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+ }
+ } else {
+ out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜蹇呴』涓�6鍒�12浣�"));
+ return;
+ }
+ }
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0