From a57f0c5c9e818173305df3cfb6801fef8af475c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:08 +0800
Subject: [PATCH] 删除老版本通知
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 76 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 37 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 6e6247d..47215bd 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
@@ -211,13 +211,12 @@
@Resource
private AccountMessageService accountMessageService;
-
+
@Resource
private MaskKeyService maskKeyService;
-
+
@Resource
private UserTaoLiJinDetailService userTaoLiJinDetailService;
-
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -774,8 +773,8 @@
data.put("canExtract", canExtract);
data.put("extractErrorMsg", errorMsg);
- data.put("minMoney", minMoney);//鍗曠瑪鏈�浣�
- data.put("maxMoney", maxMoney);//鍗曠瑪鏈�楂�
+ data.put("minMoney", minMoney);// 鍗曠瑪鏈�浣�
+ data.put("maxMoney", maxMoney);// 鍗曠瑪鏈�楂�
data.put("maxDayCount", maxDayCount);
data.put("bindingAccountList", gson.toJson(filterBindingAccount(bindingAccountList)));
@@ -1082,7 +1081,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) {
@@ -1199,7 +1198,7 @@
} else if (etype == 111) {
out.print(JsonUtil.loadFalseResult("鏇存崲浜嗘墜鏈哄彿鍚�7澶╁唴涓嶅厑璁告彁鐜�"));
} else if (etype == 110) {
- out.print(JsonUtil.loadFalseResult(Constant.znxConfig.getExtractWrongMsg()));
+ out.print(JsonUtil.loadFalseResult("鏈夌淮鏉冭鍗曞皻鏈墸娆�"));
}
}
@@ -1347,7 +1346,7 @@
// count>0 鏈夋秷鎭�
int count = accountMessageService.getCanOpenCount(uid);
out.print(JsonUtil.loadTrueResult(count));
-
+
ThreadUtil.run(new Runnable() {
@Override
public void run() {
@@ -1362,8 +1361,9 @@
}
@RequestMapping("collectionGoods")
- public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType, PrintWriter out) {
- if (goodsType == null) {
+ public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType,
+ PrintWriter out) {
+ if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId, goodsType);
@@ -1372,13 +1372,13 @@
out.print(JsonUtil.loadFalseResult(""));
return;
}
-
+
if (goodsType == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = JDApiUtil.queryGoodsDetail(auctionId);
if (jdGoods == null) {
jdGoods = JDApiUtil.getGoodsDetail(auctionId);
}
-
+
if (jdGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
} else {
@@ -1394,14 +1394,14 @@
if (pddGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
return;
- }
+ }
try {
collectionGoodsV2Service.addPDDCollection(uid, pddGoods);
out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
} catch (CollectionGoodsException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
-
+
} else {
try {
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
@@ -1439,14 +1439,15 @@
* @param out
*/
@RequestMapping("collectionGoodsJp")
- public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType, PrintWriter out) {
+ public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,
+ PrintWriter out) {
if (uid == null || auctionId == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(""));
return;
}
-
- if (goodsType == null) {
+
+ if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
@@ -1454,9 +1455,9 @@
if (find == null) {
if (goodsType == Constant.SOURCE_TYPE_JD) {
-
+
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
-
+
} else {
try {
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
@@ -1565,14 +1566,16 @@
}
@RequestMapping("deleteCollectionGoods")
- public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType, PrintWriter out) {
+ public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType,
+ PrintWriter out) {
if (type != null && type == 1) {
clearConllectionGoods(acceptData, uid, out);
} else {
if (!StringUtil.isNullOrEmpty(ids)) {
Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr), goodsType);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),
+ goodsType);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2142,18 +2145,15 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
-
+
if (mySettings.getOpenSpreadHongBao() == null) {
- if(userTaoLiJinDetailService.countDetail(uid) > 0) {
+ if (userTaoLiJinDetailService.countDetail(uid) > 0) {
mySettings.setOpenSpreadHongBao(1);
} else {
mySettings.setOpenSpreadHongBao(0);
}
}
data.put("moduleState", mySettings);
-
-
-
int welfareCenterNews = 0;
String invitCode = null;
@@ -2235,9 +2235,9 @@
}
}
-
/**
* 鐢ㄦ埛鏇存崲澶村儚
+ *
* @param acceptData
* @param fileList
* @param uid
@@ -2245,22 +2245,23 @@
* @param out
*/
@RequestMapping(value = "uploadPortrait")
- public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request, PrintWriter out) {
+ public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request,
+ PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖"));
return;
}
-
+
userInfoService.uploadPortrait(file, uid);
-
+
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
+
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
try {
@@ -2284,9 +2285,10 @@
}
}
}
-
+
/**
* 鏇存崲鏄电О
+ *
* @param acceptData
* @param nickName
* @param uid
@@ -2307,14 +2309,14 @@
out.print(JsonUtil.loadFalseResult("鏄电О杩囬暱"));
return;
}
-
- if(maskKeyService.examineContent(nickName)) {
+
+ if (maskKeyService.examineContent(nickName)) {
out.print(JsonUtil.loadFalseResult("涓嶈兘鍖呭惈鏁忔劅璇嶆眹"));
return;
}
-
+
userInfoService.saveUserInfo(nickName, uid);
-
+
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0