From 3727469752a977dde6327e2c48d761b20b565d3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 七月 2022 09:19:21 +0800
Subject: [PATCH] 商品ID字符串化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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..a44bee5 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));
@@ -145,11 +153,11 @@
}
- TaoBaoGoodsBrief goods = getTaoBaoGoods(Long.parseLong(goodsId));
+ TaoBaoGoodsBrief goods = getTaoBaoGoods(goodsId);
//鍔犺浇璧勯噾淇℃伅
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));
//閲嶇疆璧勯噾淇℃伅
@@ -159,7 +167,7 @@
GoodsDetailVOLijinFactory.fillRights(goodsDetailVO.getGoods());
// 搴楅摵淇℃伅
- TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getId(), goods.getSellerId());
+ TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
if (shop != null) {
String shopLink = shop.getShopLink();
if (StringUtil.isNullOrEmpty(shopLink)) {
@@ -266,11 +274,24 @@
break;
}
+ ThreadUtil.run(new Runnable() {
+
+
+ @Override
+ public void run() {
+ try {
+ userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));
+ }catch(Exception e){
+
+ }
+ }
+ });
+
//鏄惁鏀惰棌
extraVO.setCollected(false);
if (uid != null) {
- CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsType == Constant.SOURCE_TYPE_SUNING ? goodsIdSuning : Long.parseLong(goodsDetailVO.getGoods().getGoodsId()), goodsType);
+ CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsType == Constant.SOURCE_TYPE_SUNING ? goodsIdSuning+"" : goodsDetailVO.getGoods().getGoodsId(), goodsType);
if (collectionGoodsV2 != null) {
extraVO.setCollected(true);
}
@@ -284,7 +305,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,19 +380,19 @@
*
* @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);
}
- private TaoBaoGoodsBrief getTaoBaoGoods(Long id) {
+ private TaoBaoGoodsBrief getTaoBaoGoods(String id) {
try {
TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);
if (goods != null) {
--
Gitblit v1.8.0