From 824d003d330a25b1f5b1e9ed30e4ad868868c2ab Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 01 六月 2020 16:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
index f14d402..aa32186 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
@@ -22,6 +22,8 @@
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -44,7 +46,10 @@
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
+import com.yeshi.fanli.util.suning.SuningApiUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -95,7 +100,7 @@
* @param out
*/
@RequestMapping("collectionGoods")
- public void collectionGoods(AcceptData acceptData, long uid, long id, int type, Integer goodsType,
+ public void collectionGoods(AcceptData acceptData, long uid, String id, int type, Integer goodsType,
PrintWriter out) {
try {
if (goodsType == null) {
@@ -103,21 +108,30 @@
}
if (type != 1) {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, id, goodsType);
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(sts[1]), goodsType);
+ } else
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(id), goodsType);
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
return;
}
-
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, id, goodsType);
+ Long goodsId = null;
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ goodsId = Long.parseLong(sts[1]);
+ } else
+ goodsId = Long.parseLong(id);
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsId, goodsType);
if (find != null) {
out.print(JsonUtil.loadFalseResult(""));
return;
}
if (goodsType == Constant.SOURCE_TYPE_JD) {
- JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(id);
+ JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(id);
+ jdGoods = JDApiUtil.getGoodsDetail(goodsId);
}
if (jdGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
@@ -125,15 +139,30 @@
}
collectionGoodsV2Service.addJDCollection(uid, jdGoods);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(id);
+ PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
if (pddGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
return;
}
collectionGoodsV2Service.addPDDCollection(uid, pddGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_VIP) {
+ VIPGoodsInfo vipGoods = VipShopApiUtil.getGoodsDetail(id);
+ if (vipGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addVIPCollection(uid, vipGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ SuningGoodsInfo suningGoods = SuningApiUtil.getGoodsDetail(sts[1], sts[0]);
+ if (suningGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addSuningCollection(uid, suningGoods);
} else {
try {
- TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(id);
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
} catch (TaobaoGoodsDownException e) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
@@ -207,7 +236,7 @@
boolean notBackSuVip = false;
if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
notBackSuVip = true;
-
+
List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,
Constant.PAGE_SIZE, goodsType, notBackSuVip);
@@ -337,8 +366,7 @@
boolean notBackSuVip = false;
if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
notBackSuVip = true;
-
-
+
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,
20, goodsType, notBackSuVip);
--
Gitblit v1.8.0