From 1f2740829d4e7e1198a2070f66849873b18b4c22 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 31 五月 2021 18:50:00 +0800
Subject: [PATCH] 特价消息完善
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
index 9379b7f..14bbbf3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
@@ -14,6 +14,8 @@
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.SystemEnum;
+import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
@@ -21,11 +23,13 @@
import com.yeshi.fanli.exception.pdd.PDDApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
+import com.yeshi.fanli.lijin.manager.UserLijinMnager;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOLijinFactory;
@@ -77,6 +81,14 @@
@Resource
private GoodsLijinMnager goodsLijinMnager;
+
+ @Resource
+ private UserLijinMnager userLijinMnager;
+
+ @Resource
+ private PIDManager pidManager;
+
+
/**
* 鑾峰彇鍟嗗搧璇︽儏
*
@@ -91,9 +103,10 @@
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
GoodsDetailVO.GoodsExtraVO extraVO = new GoodsDetailVO.GoodsExtraVO();
GoodsMoneyConfigParamsDTO paramsDTO = new GoodsMoneyConfigParamsDTO();
- paramsDTO.setFanLiRate(new BigDecimal("60"));
+ paramsDTO.setFanLiRate(goodsLijinMnager.getFanLiRate(uid));
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<>();
+ Long goodsIdSuning = null;
switch (goodsType) {
case Constant
.SOURCE_TYPE_TAOBAO:
@@ -125,7 +138,7 @@
case Constant
.SOURCE_TYPE_PDD:
- PDDGoodsDetail pddGoodsDetail = getPDDGoods(Long.parseLong(goodsId), uid);
+ PDDGoodsDetail pddGoodsDetail = getPDDGoods(acceptData.getSystem(), Long.parseLong(goodsId), uid);
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertPDDGoods(pddGoodsDetail, paramsDTO));
extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + goodsId);
break;
@@ -140,6 +153,8 @@
.SOURCE_TYPE_SUNING:
String[] ids = SuningUtil.getGoodsIdDetail(goodsId);
SuningGoodsInfo suningGoodsInfo = SuningApiUtil.getGoodsDetail(ids[1], ids[0]);
+ goodsIdSuning = Long.parseLong(suningGoodsInfo.getCommodityInfo().getCommodityCode());
+
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertSuningGoods(suningGoodsInfo, paramsDTO));
extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_suning.html?id="
+ suningGoodsInfo.getCommodityInfo().getCommodityCode() + "&supplierCode="
@@ -151,7 +166,7 @@
//鏄惁鏀惰棌
extraVO.setCollected(false);
if (uid != null) {
- CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, Long.parseLong(goodsDetailVO.getGoods().getGoodsId()), goodsType);
+ CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsType == Constant.SOURCE_TYPE_SUNING ? goodsIdSuning : Long.parseLong(goodsDetailVO.getGoods().getGoodsId()), goodsType);
if (collectionGoodsV2 != null) {
extraVO.setCollected(true);
}
@@ -197,6 +212,7 @@
data.put("type", 1);
data.put("link", link);
data.put("native", true);
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
} catch (LiJinException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -208,7 +224,7 @@
out.print(JsonUtil.loadFalseResult(e.getMsg()));
return;
} catch (LiJinUserException e) {
- out.print(JsonUtil.loadFalseResult(2001,"浠婃棩棰嗗彇绾㈠寘娆℃暟瓒呴檺"));
+ out.print(JsonUtil.loadFalseResult(2001, "浠婃棩棰嗗彇绾㈠寘娆℃暟瓒呴檺"));
return;
}
}
@@ -220,7 +236,7 @@
* @param goodsDetailVO
*/
private void loadLijinInfo(Long uid, GoodsDetailVO goodsDetailVO) {
- VIPEnum vipRank = goodsLijinMnager.getVIPRank(uid);
+ VIPEnum vipRank = userLijinMnager.getVIPRank(uid);
GoodsDetailVO.GoodsHongBaoListVO.UserLevelVO userLevelVO = goodsLijinMnager.getUserLevel(vipRank);
if (goodsDetailVO.getGoods().getPriceList() != null && goodsDetailVO.getGoods().getPriceList().size() > 0)
goodsDetailVO.getGoods().getPriceList().get(0).setUserLevel(userLevelVO);
@@ -272,15 +288,16 @@
return jdGoods;
}
- private PDDGoodsDetail getPDDGoods(Long id, Long uid) {
+ private PDDGoodsDetail getPDDGoods(SystemEnum system, Long id, Long uid) {
+ String pid = pidManager.getPidCache(system, Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.fanli);
PDDGoodsDetail pddGoods = null;
try {
- pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, PinDuoDuoApiUtil.PID_FANLI, pddAuthService.getFanliCustomParams(uid));
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, pid, pddAuthService.getFanliCustomParams(uid));
} catch (PDDApiException e) {
e.printStackTrace();
if (e.getCode() == PDDApiException.CODE_NOT_AUTH) {
try {
- pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, PinDuoDuoApiUtil.PID_FANLI, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, pid, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
} catch (PDDApiException e1) {
}
}
--
Gitblit v1.8.0