From d1dccd08a249b830a95eeeb04af25f87d5c056be Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 11:13:04 +0800
Subject: [PATCH] 金币明细bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 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 d228ffa..202003c 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
@@ -64,10 +64,10 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
-import com.yeshi.fanli.exception.BindingAccountException;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.exception.user.BindingAccountException;
import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
@@ -113,6 +113,7 @@
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.annotation.UserActive;
import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
@@ -216,10 +217,9 @@
@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";
@@ -1394,7 +1394,6 @@
}
}
-
/**
* h5鏀惰棌
*
@@ -1701,7 +1700,6 @@
}
-
/**
* 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
*
@@ -1836,7 +1834,6 @@
e.printStackTrace();
}
}
-
/**
* 鐢ㄦ埛闃熷憳淇℃伅淇濆瓨 1.4.1
@@ -2041,6 +2038,7 @@
* @param requst
* @param out
*/
+ @UserActive(uid = "#uid")
@RequestMapping(value = "getuserinfoNew", method = RequestMethod.POST)
public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
try {
@@ -2128,20 +2126,20 @@
userInfo.setRankNamePicture(null);
userInfo.setRankIcon(null);
}
-
+
// 1.6.5 涔嬪悗杩斿洖鎬у埆銆佸井淇″彿
- if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
- if(userInfoExtra.getSex() != null)
+ if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (userInfoExtra.getSex() != null)
userInfo.setSex(userInfoExtra.getSex());
-
- if(!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
+
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
userInfo.setWeiXin(userInfoExtra.getWeiXin());
}
}
// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
- if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+ 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); // 閭�璇风爜
data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
@@ -2226,7 +2224,7 @@
userInfoService.uploadPortrait(file, uid);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
+
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
try {
@@ -2260,7 +2258,8 @@
* @param out
*/
@RequestMapping(value = "saveInfo")
- public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid, PrintWriter out) {
+ public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
+ PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -2273,34 +2272,34 @@
out.print(JsonUtil.loadFalseResult("鏄电О杩囬暱"));
return;
}
-
+
if (maskKeyService.examineContent(nickName)) {
out.print(JsonUtil.loadFalseResult("涓嶈兘鍖呭惈鏁忔劅璇嶆眹"));
return;
}
userInfoService.saveUserInfo(nickName, uid);
-
+
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);
}
-
+
// 淇敼寰俊鍙�
if (!StringUtil.isNullOrEmpty(weiXin)) {
if (weiXin.length() > 32) {
out.print(JsonUtil.loadFalseResult("寰俊鍙疯繃闀�"));
return;
}
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
UserInfoExtra extra = new UserInfoExtra();
extra.setId(userInfoExtra.getId());
extra.setWeiXin(weiXin);
userInfoExtraService.saveUserInfoExtra(extra);
-
+
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);
}
}
-
+
// 淇敼鎬у埆
if (sex != null && sex > 0 && sex < 3) {
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
@@ -2309,7 +2308,7 @@
extra.setId(userInfoExtra.getId());
extra.setSex(sex);
userInfoExtraService.saveUserInfoExtra(extra);
-
+
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");
}
}
--
Gitblit v1.8.0