From 9129d51874b36943419994937af56c2f73aed1a0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 03 六月 2020 15:14:10 +0800
Subject: [PATCH] 唯品会,苏宁相关bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index c3d751a..ba8dfa0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -443,11 +443,15 @@
 			if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON
 					|| result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON) {
 				link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid());
-				if (!StringUtil.isNullOrEmpty(link)) {
-					goods.setCouponLink(link);
-					taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, info.getPid(), link);
-				}
+			} else if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {// 鏈夊埜
+				link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid());
 			}
+
+			if (!StringUtil.isNullOrEmpty(link)) {
+				goods.setCouponLink(link);
+				taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, info.getPid(), link);
+			}
+
 			if (StringUtil.isNullOrEmpty(link)) {
 				TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info);
 				if (taoBaoLink == null) {
@@ -613,22 +617,28 @@
 		// 鏌ヨ鏄惁涓哄ぇ娣樺鍟嗗搧
 
 		String link = null;
+		try {
+			link = DaTaoKeApiUtil.convertLink(auctionId, app.getPid());
+		} catch (Exception e) {
+		}
 		DaTaoKeDetailV2 v2 = daTaoKeGoodsDetailV2Service.selectByAuctionId(auctionId);
 		if (v2 != null) {
 			try {
 				TaoBaoGoodsBrief goods = redisManager.getTaoBaoGoodsBrief(auctionId);
 				if (goods != null) {
 					if (DaTaoKeUtil.canFilterCouponInfo(goods, v2)) {
-						link = DaTaoKeApiUtil.convertLink(auctionId, app.getPid());
-						if (!StringUtil.isNullOrEmpty(link)) {
-							taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, app.getPid(), link);
-
-						}
+						// link = DaTaoKeApiUtil.convertLink(auctionId,
+						// app.getPid());
+						
 					}
 				}
 			} catch (TaobaoGoodsDownException e) {
 				throw new ShareGoodsException(4, "鍟嗗搧ID涓嶈兘涓虹┖");
 			}
+		}
+		
+		if (!StringUtil.isNullOrEmpty(link)) {
+			taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, app.getPid(), link);
 		}
 
 		if (!StringUtil.isNullOrEmpty(link)) {
@@ -708,7 +718,7 @@
 			goods.setCouponLink(taoBaoLink.getCouponLink());
 			goods.setAuctionUrl(taoBaoLink.getAuctionUrl());
 		}
-		
+
 		String link = taoBaoGoodsCacheUtil.getBaseConvertLink(auctionId, info.getPid());
 		if (link != null) {
 			goods.setCouponLink(link);
@@ -731,8 +741,6 @@
 				goods.setAuctionUrl(taoBaoLink.getAuctionUrl());
 			}
 		}
-		
-		
 
 		if (!StringUtil.isNullOrEmpty(relationId)) {
 			if (!StringUtil.isNullOrEmpty(goods.getAuctionUrl()))
@@ -911,7 +919,7 @@
 			throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�");
 		}
 
-		BigDecimal perface = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false);
+		BigDecimal perface = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70), false);
 		TaoLiJinDTO taoLiJinDTO = null;
 		try {
 			taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "鑷喘绔嬪噺", perface, 1,

--
Gitblit v1.8.0