From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 137 ++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 64 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 a91a218..a90d296 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
@@ -207,13 +207,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";
@@ -770,8 +769,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)));
@@ -1078,7 +1077,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) {
@@ -1195,7 +1194,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("鏈夌淮鏉冭鍗曞皻鏈墸娆�"));
}
}
@@ -1343,7 +1342,7 @@
// count>0 鏈夋秷鎭�
int count = accountMessageService.getCanOpenCount(uid);
out.print(JsonUtil.loadTrueResult(count));
-
+
ThreadUtil.run(new Runnable() {
@Override
public void run() {
@@ -1359,37 +1358,36 @@
@RequestMapping("collectionGoods")
public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);
- if (type == 1) {
- if (find != null) {
- out.print(JsonUtil.loadFalseResult(""));
- return;
- }
- try {
- TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
- collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- } catch (TaobaoGoodsDownException e) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- } catch (CollectionGoodsException e1) {
- out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
- }
- } else {
- if (find == null) {
- out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- return;
- } else {
+ try {
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ if (type == 1) {
+ if (find != null) {
+ out.print(JsonUtil.loadFalseResult(""));
+ return;
+ }
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
+ out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
+ } catch (TaobaoGoodsDownException e) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ }
+ } else {
+ if (find == null) {
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ return;
+ } else {
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
+ out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
}
}
+ } catch (CollectionGoodsException e1) {
+ out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
}
-
}
+
/**
* h5鏀惰棌
*
@@ -1400,30 +1398,40 @@
* @param out
*/
@RequestMapping("collectionGoodsJp")
- public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, 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;
}
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId, goodsType);
if (find == null) {
- // 娣诲姞鏀惰棌
- try {
- TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
- collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(1));
- } catch (TaobaoGoodsDownException e) {
- JsonUtil.printMode(out, callback, (JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�")));
- } catch (CollectionGoodsException e1) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+
+ } else {
+ try {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(1));
+ } catch (TaobaoGoodsDownException e) {
+ JsonUtil.printMode(out, callback, (JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�")));
+ } catch (CollectionGoodsException e1) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
+ }
}
} else {
// 鍙栨秷鏀惰棌
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
} catch (CollectionGoodsException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -1436,11 +1444,11 @@
public void collectionGoodsList(AcceptData acceptData, long uid, int page, PrintWriter out) {
List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page + 1,
- Constant.PAGE_SIZE);
+ Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO);
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO);
JSONObject data = new JSONObject();
List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -1517,14 +1525,16 @@
}
@RequestMapping("deleteCollectionGoods")
- public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, 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));
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),
+ goodsType);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2094,18 +2104,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;
@@ -2187,9 +2194,9 @@
}
}
-
/**
* 鐢ㄦ埛鏇存崲澶村儚
+ *
* @param acceptData
* @param fileList
* @param uid
@@ -2197,22 +2204,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 {
@@ -2236,9 +2244,10 @@
}
}
}
-
+
/**
* 鏇存崲鏄电О
+ *
* @param acceptData
* @param nickName
* @param uid
@@ -2259,14 +2268,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