From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 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 18b6fe2..14ca8a5 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
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.taobao;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -19,12 +20,15 @@
 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;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
@@ -41,9 +45,12 @@
 
 	@Resource
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-	
+
 	@Resource
 	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
+	@Resource
+	private ConfigTaoLiJinService configTaoLiJinService;
 
 	@Override
 	public void addShareHotGoods(ShareHotGoods goods) {
@@ -70,8 +77,8 @@
 				goodsList.add(shg.getGoods());
 		}
 
-		//杩囨护鍩烘湰鍟嗗搧淇℃伅
-		goodsList=taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
+		// 杩囨护鍩烘湰鍟嗗搧淇℃伅
+		goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
 
 		// 杩囨护涓嬬嚎鍟嗗搧
 		goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
@@ -98,7 +105,15 @@
 
 	@Override
 	public List<TaoBaoGoodsBrief> listPreGoods(int page) {
-		List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page);
+		String warningValue = configTaoLiJinService.getValueByKey("warning_value",
+				new Date(TimeUtil.convertToTimeTemp(
+						TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"),
+						"yyyy-MM-dd")));
+
+		BigDecimal minComminsion = new BigDecimal(1)
+				.divide(new BigDecimal(warningValue).multiply(new BigDecimal("0.01")), 2, RoundingMode.UP);
+
+		List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page, minComminsion);
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		if (list != null) {
 			for (DaTaoKeDetailV2 v2 : list)
@@ -114,19 +129,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