From e75b0d79535a6bcd147cca4a54632b70b42afdb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 18:10:18 +0800
Subject: [PATCH] 特价完善
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 fbc66e3..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
@@ -23,6 +23,7 @@
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;
@@ -80,8 +81,13 @@
@Resource
private GoodsLijinMnager goodsLijinMnager;
+
+ @Resource
+ private UserLijinMnager userLijinMnager;
+
@Resource
private PIDManager pidManager;
+
/**
* 鑾峰彇鍟嗗搧璇︽儏
@@ -97,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:
@@ -146,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="
@@ -157,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);
}
@@ -203,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()));
@@ -226,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);
--
Gitblit v1.8.0