From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
index 92b95c7..ff30e69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
@@ -14,16 +14,15 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.taobao.ShareHotGoodsDao;
-import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
 import com.yeshi.fanli.entity.taobao.ShareHotGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
+import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
 import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
 import com.yeshi.fanli.util.StringUtil;
@@ -43,14 +42,11 @@
 	private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
 
 	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
-	@Resource
 	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
 
 	@Resource
 	private ConfigTaoLiJinService configTaoLiJinService;
-
+	
 	@Override
 	public void addShareHotGoods(ShareHotGoods goods) {
 		if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)
@@ -82,7 +78,7 @@
 		// 杩囨护涓嬬嚎鍟嗗搧
 		goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
 		// 娣诲姞澶ф窐瀹俊鎭�
-		goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+		goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
 		Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
 		if (goodsList != null)
 			for (TaoBaoGoodsBrief g : goodsList)
@@ -128,19 +124,18 @@
 
 	@Override
 	public boolean verifyCanCreateTLJ(Long auctionId, TaoKeAppInfo info) {
-		TaoLiJinDTO taoLiJinDTO = null;
 		try {
-			taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲戦獙璇�", new BigDecimal("1.00"), 1, new Date(),
+			TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲戦獙璇�", new BigDecimal("1.00"), 1, new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), info);
-		} catch (TaoKeApiException e) {
-			if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
-				// 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
+		} catch (TaoLiJinCreateException e1) {
+			if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {// 鍟嗗搧涓嶅厑璁稿垱寤烘窐绀奸噾
 				deleteByGoodsId(auctionId);
 				return false;
-			} else if (e.getCode() == TaoKeApiException.CODE_TLJ_NO_MONEY) {
-				// 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
 			}
+
+		} catch (TaoKeApiException e) {
+
 		}
 		return true;
 	}

--
Gitblit v1.8.0