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/lijin/GoodsControllerLijin.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 d6c857f..70b7539 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
@@ -61,6 +61,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.NumberUtil;
import javax.annotation.Resource;
import java.io.PrintWriter;
@@ -73,8 +74,6 @@
@RequestMapping("api/lijin/goods")
public class GoodsControllerLijin {
Logger userGoodsScanLogger = LoggerFactory.getLogger("userGoodsScanLog");
-
-
@Resource
@@ -153,7 +152,7 @@
}
- TaoBaoGoodsBrief goods = getTaoBaoGoods(Long.parseLong(goodsId));
+ TaoBaoGoodsBrief goods = getTaoBaoGoods(goodsId);
//鍔犺浇璧勯噾淇℃伅
com.yeshi.fanli.vo.goods.GoodsDetailVO goodsDetailVO1 = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
@@ -167,7 +166,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)) {
@@ -281,7 +280,7 @@
public void run() {
try {
userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));
- }catch(Exception e){
+ } catch (Exception e) {
}
}
@@ -291,7 +290,7 @@
//鏄惁鏀惰棌
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);
}
@@ -305,7 +304,13 @@
extraVO.setBuyValid(true);
extraVO.setListCouponUser(listCouponUser);
goodsDetailVO.setExtra(extraVO);
- loadLijinInfo(uid, acceptData.getSystem(), goodsDetailVO);
+ try {
+ loadLijinInfo(uid, acceptData.getSystem(), goodsDetailVO);
+ } catch (Exception e) {
+ if (goodsDetailVO.getGoods().getMoneyInfo() != null) {
+ goodsDetailVO.getGoods().getMoneyInfo().setHongBaoMoney("0.00");
+ }
+ }
//娓呴櫎涓存椂淇℃伅
goodsDetailVO.getGoods().setTempCoupon(null);
if (goodsDetailVO.getGoods().getLabels() == null)
@@ -335,7 +340,7 @@
try {
- LiJinExpendRecord record = goodsLijinMnager.createTBLijin(Long.parseLong(goodsId), uid, new Date(user.getCreatetime()));
+ LiJinExpendRecord record = goodsLijinMnager.createTBLijin(goodsId, uid, new Date(user.getCreatetime()));
String sendUrl = record.getSendUrl();
if (StringUtil.isNullOrEmpty(sendUrl)) {
out.print(JsonUtil.loadFalseResult("绀奸噾鍒涘缓澶辫触"));
@@ -392,17 +397,23 @@
}
- private TaoBaoGoodsBrief getTaoBaoGoods(Long id) {
+ private TaoBaoGoodsBrief getTaoBaoGoods(String id) {
try {
TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);
if (goods != null) {
return goods;
}
TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY);
- app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET);
- app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
- app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);
+ if (NumberUtil.isNumeric(id)) {
+ app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+ app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ app.setPid(TaoBaoConstant.TAOBAO_PID_DEFAULT);
+ } else {
+ app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY);
+ app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET);
+ app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
+ }
+ app.setAdzoneId(app.getPid().split("_")[3]);
goods = TaoKeApiUtil.searchGoodsDetail(id, app);
final TaoBaoGoodsBrief finalGoods = goods;
--
Gitblit v1.8.0