From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 23 一月 2024 17:17:55 +0800 Subject: [PATCH] 抖音转链修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 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 f92f548..bfefebf 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 @@ -10,6 +10,8 @@ import javax.annotation.Resource; import com.yeshi.fanli.lijin.manager.GoodsLijinMnager; +import com.yeshi.fanli.util.goods.douyin.CSJCPSApiUtil; +import com.yeshi.fanli.util.goods.douyin.vo.DYGoodsDetail; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -113,18 +115,18 @@ if (type != 1) { if (goodsType == Constant.SOURCE_TYPE_SUNING) { String[] sts = SuningUtil.getGoodsIdDetail(id); - collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(sts[1]), goodsType); + collectionGoodsV2Service.cancelCollectionByAuctionId(uid, sts[1], goodsType); } else - collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(id), goodsType); + collectionGoodsV2Service.cancelCollectionByAuctionId(uid, id, goodsType); out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛")); return; } - Long goodsId = null; + String goodsId = null; if (goodsType == Constant.SOURCE_TYPE_SUNING) { String[] sts = SuningUtil.getGoodsIdDetail(id); - goodsId = Long.parseLong(sts[1]); + goodsId =sts[1]; } else - goodsId = Long.parseLong(id); + goodsId = id; CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsId, goodsType); if (find != null) { out.print(JsonUtil.loadFalseResult("")); @@ -132,9 +134,9 @@ } if (goodsType == Constant.SOURCE_TYPE_JD) { - JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId); + JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); if (jdGoods == null) { - jdGoods = JDApiUtil.getGoodsDetail(goodsId); + jdGoods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId)); } if (jdGoods == null) { out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�")); @@ -142,7 +144,7 @@ } collectionGoodsV2Service.addJDCollection(uid, jdGoods); } else if (goodsType == Constant.SOURCE_TYPE_PDD) { - PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId); + PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); if (pddGoods == null) { out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�")); return; @@ -163,6 +165,13 @@ return; } collectionGoodsV2Service.addSuningCollection(uid, suningGoods); + }else if (goodsType == Constant.SOURCE_TYPE_DY) { + DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(id)); + if (goods == null) { + out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�")); + return; + } + collectionGoodsV2Service.addDYCollection(uid, goods); } else { try { TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId); @@ -246,10 +255,10 @@ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip); JSONObject data = new JSONObject(); - List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>(); + List<GoodsDetailVO> list = new ArrayList<>(); if (collectionGoodsList != null && collectionGoodsList.size() > 0) { - List<Long> listGid = new ArrayList<Long>(); + List<String> listGid = new ArrayList<>(); for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) { CommonGoods commonGoods = collectionGoodsV2.getCommonGoods(); if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) { @@ -287,9 +296,9 @@ if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 && commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { int state = 1; // 榛樿鍋滃敭 - Long goodsId = commonGoods.getGoodsId(); + String goodsId = commonGoods.getGoodsId(); for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) { - Long auctionId = taoKeGoods.getAuctionId(); + String auctionId = taoKeGoods.getAuctionId(); if (goodsId == auctionId || goodsId.equals(auctionId)) { state = 0; // 鍦ㄥ敭 break; -- Gitblit v1.8.0