From 42411e4a26461229c6bca6e89ca55e98a80f5a4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 18:08:17 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 2960770..6e8ae4c 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
@@ -29,6 +29,7 @@
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import com.yeshi.fanli.lijin.manager.UserLijinMnager;
import com.yeshi.fanli.lijin.manager.UserLijinSendManager;
+import com.yeshi.fanli.log.vo.UserGoodsScanLog;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
@@ -54,6 +55,8 @@
import com.yeshi.fanli.lijin.vo.GoodsDetailVO;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -69,6 +72,10 @@
@Controller
@RequestMapping("api/lijin/goods")
public class GoodsControllerLijin {
+ Logger userGoodsScanLogger = LoggerFactory.getLogger("userGoodsScanLog");
+
+
+
@Resource
private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
@@ -119,11 +126,12 @@
* @param from
* @return
*/
+
@RequestMapping("getGoodsDetail")
public void getGoodsDetail(AcceptData acceptData, int goodsType, String goodsId, Long uid, String from, PrintWriter out) {
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
GoodsDetailVO.GoodsExtraVO extraVO = new GoodsDetailVO.GoodsExtraVO();
- GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(), acceptData.getSystem());
paramsDTO.setFanLiRate(goodsLijinMnager.getFanLiRate(uid));
@@ -149,7 +157,7 @@
//鍔犺浇璧勯噾淇℃伅
com.yeshi.fanli.vo.goods.GoodsDetailVO goodsDetailVO1 = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
- goodsDetailVO1 = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goods, goodsDetailVO1);
+ goodsDetailVO1 = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goods, goodsDetailVO1, true);
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertTaoBao(goods, paramsDTO));
//閲嶇疆璧勯噾淇℃伅
@@ -266,6 +274,8 @@
break;
}
+ userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));
+
//鏄惁鏀惰棌
extraVO.setCollected(false);
@@ -284,7 +294,7 @@
extraVO.setBuyValid(true);
extraVO.setListCouponUser(listCouponUser);
goodsDetailVO.setExtra(extraVO);
- loadLijinInfo(uid, goodsDetailVO);
+ loadLijinInfo(uid, acceptData.getSystem(), goodsDetailVO);
//娓呴櫎涓存椂淇℃伅
goodsDetailVO.getGoods().setTempCoupon(null);
if (goodsDetailVO.getGoods().getLabels() == null)
@@ -359,14 +369,14 @@
*
* @param goodsDetailVO
*/
- private void loadLijinInfo(Long uid, GoodsDetailVO goodsDetailVO) {
+ private void loadLijinInfo(Long uid, SystemEnum system, GoodsDetailVO goodsDetailVO) {
VIPEnum vipRank = userLijinMnager.getVIPRank(uid);
- GoodsDetailVO.GoodsHongBaoListVO.UserLevelVO userLevelVO = goodsLijinMnager.getUserLevel(vipRank, true);
+ GoodsDetailVO.GoodsHongBaoListVO.UserLevelVO userLevelVO = goodsLijinMnager.getUserLevel(system, vipRank, true);
//杩斿埄UserLevel
if (goodsDetailVO.getGoods().getPriceList() != null && goodsDetailVO.getGoods().getPriceList().size() > 0)
goodsDetailVO.getGoods().getPriceList().get(0).setUserLevel(userLevelVO);
//绀奸噾UserLevel
- userLevelVO = goodsLijinMnager.getUserLevel(vipRank, false);
+ userLevelVO = goodsLijinMnager.getUserLevel(system, vipRank, false);
goodsLijinMnager.loadLijinInfo(vipRank, goodsDetailVO, userLevelVO);
}
--
Gitblit v1.8.0