From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 52 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 d2e3d4b..d228ffa 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
@@ -54,6 +54,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
@@ -96,6 +97,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@@ -108,6 +110,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
+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.email.MailSenderUtil;
@@ -213,6 +216,10 @@
@Resource
private UserTaoLiJinDetailService userTaoLiJinDetailService;
+
+ @Resource
+ private UserInfoModifyRecordService userInfoModifyRecordService;
+
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -1077,7 +1084,7 @@
* @param type
* @param out
*/
- @RequestSerializableByKey(key = "uid")
+ @RequestSerializableByKey(key = "#uid")
@RequestMapping(value = "extractmoneynew", method = RequestMethod.POST)
public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,
HttpServletRequest request, int type, PrintWriter out) {
@@ -1694,6 +1701,7 @@
}
+
/**
* 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
*
@@ -1727,15 +1735,10 @@
bossData = new JSONObject();
UserInfo boss = threeSale.getBoss();
if (boss != null) {
- bossData.put("bossId", boss.getId());
bossData.put("nickName", boss.getNickName());
bossData.put("portrait", boss.getPortrait());
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(boss.getId());
- if (userInfoExtra != null)
- bossData.put("weiXin", userInfoExtra.getWeiXin());
}
-
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
Long createTime = threeSale.getCreateTime();
Date inviteTime = new Date(createTime);
@@ -1832,8 +1835,8 @@
out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
-
}
+
/**
* 鐢ㄦ埛闃熷憳淇℃伅淇濆瓨 1.4.1
@@ -1847,48 +1850,35 @@
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
-
- try {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
- }
-
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
- }
-
- List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
- if (list == null || list.size() == 0) {
-
- ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
- extraInfo.setWorker(worker);
- extraInfo.setNickname(memoName);
- extraInfo.setCreateTime(new Date());
- extraInfo.setUpdateTime(new Date());
-
- UserInfo boss = new UserInfo(uid);
- extraInfo.setBoss(boss);
-
- threeSaleExtraInfoSerivce.insert(extraInfo);
-
- } else {
- ThreeSaleExtraInfo extraInfo = list.get(0);
- extraInfo.setNickname(memoName);
- extraInfo.setUpdateTime(new Date());
- threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
- }
-
- out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
}
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());
+ if (extraInfo == null) {
+ extraInfo = new ThreeSaleExtraInfo();
+ extraInfo.setWorker(worker);
+ extraInfo.setNickname(memoName);
+ extraInfo.setCreateTime(new Date());
+ extraInfo.setUpdateTime(new Date());
+ extraInfo.setBoss(new UserInfo(uid));
+ threeSaleExtraInfoSerivce.insertSelective(extraInfo);
+ } else {
+ ThreeSaleExtraInfo updateInfo = new ThreeSaleExtraInfo();
+ updateInfo.setId(extraInfo.getId());
+ updateInfo.setNickname(memoName);
+ updateInfo.setUpdateTime(new Date());
+ threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);
+ }
+ out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
/**
@@ -2139,11 +2129,18 @@
userInfo.setRankIcon(null);
}
- userInfo.setSex(userInfoExtra.getSex());
- userInfo.setWeiXin(userInfoExtra.getWeiXin());
+ // 1.6.5 涔嬪悗杩斿洖鎬у埆銆佸井淇″彿
+ if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if(userInfoExtra.getSex() != null)
+ userInfo.setSex(userInfoExtra.getSex());
+
+ if(!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
+ userInfo.setWeiXin(userInfoExtra.getWeiXin());
+ }
}
-
-
+ // 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
+ if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+ userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
data.put("invitCode", invitCode); // 閭�璇风爜
@@ -2229,7 +2226,7 @@
userInfoService.uploadPortrait(file, uid);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
+
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
try {
@@ -2282,6 +2279,8 @@
return;
}
userInfoService.saveUserInfo(nickName, uid);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);
}
// 淇敼寰俊鍙�
@@ -2297,6 +2296,8 @@
extra.setId(userInfoExtra.getId());
extra.setWeiXin(weiXin);
userInfoExtraService.saveUserInfoExtra(extra);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);
}
}
@@ -2308,6 +2309,8 @@
extra.setId(userInfoExtra.getId());
extra.setSex(sex);
userInfoExtraService.saveUserInfoExtra(extra);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");
}
}
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
--
Gitblit v1.8.0