From d2546652966b03f9273d84312638f583665dec37 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 14:25:26 +0800
Subject: [PATCH] 更改收藏接口
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 71 +++++++----------------------------
1 files changed, 15 insertions(+), 56 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 47215bd..f8c785a 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
@@ -40,7 +40,6 @@
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.dto.order.OrderItem;
-import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
@@ -59,7 +58,6 @@
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
-import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -116,8 +114,6 @@
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
import com.yeshi.fanli.util.factory.OrderItemFactory;
-import com.yeshi.fanli.util.jd.JDApiUtil;
-import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -1361,74 +1357,37 @@
}
@RequestMapping("collectionGoods")
- 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);
- if (type == 1) {
- if (find != null) {
- 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 {
- try {
- collectionGoodsV2Service.addJDCollection(uid, jdGoods);
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
- }
- } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(auctionId);
- if (pddGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {
+ try {
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ if (type == 1) {
+ if (find != null) {
+ out.print(JsonUtil.loadFalseResult(""));
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);
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 {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);
+ 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鏀惰棌
*
--
Gitblit v1.8.0