From b2e7e9ed88acb0e0ea50571ae028199926b7d262 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 15:34:29 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
index 6a9dd20..8d011b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
@@ -22,6 +22,7 @@
 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.TLJBuyGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
@@ -173,14 +174,15 @@
 			taoLiJinDTO = 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), app);
-		} 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) {
+			} else if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_NO_MONEY) {
 				// 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
 			}
+		} catch (TaoKeApiException e) {
 		}
 		return true;
 	}
@@ -254,4 +256,9 @@
 		return tljBuyGoodsDao.selectByAuctionIdAndDay(auctionId, day);
 	}
 
+	@Override
+	public void removeGoods(Long auctionId) {
+		tljBuyGoodsDao.deleteByAuctionId(auctionId);
+	}
+
 }
\ No newline at end of file

--
Gitblit v1.8.0