From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index a6bfe0a..9e06eb2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -23,6 +23,7 @@
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.exception.ShareGoodsException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
 import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
@@ -41,7 +42,6 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.VersionUtil;
 import com.yeshi.fanli.util.factory.MonitorFactory;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
@@ -94,7 +94,7 @@
 
 	private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
 		JSONObject data = new JSONObject();
-		TaoBaoLink taoBaoLink;
+		TaoBaoLink taoBaoLink = null;
 		try {
 			// 鏍规嵁鏃ユ湡涓庡晢鍝両D鏌ヨ
 			TLJBuyGoods tljBuyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(auctionId,
@@ -107,6 +107,9 @@
 			}
 			TaoKeAppInfo app = new TaoKeAppInfo(config.getAppKey(), config.getAppSecret(), config.getDefaultPid());
 			taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuyWithOutFanLi(uid, auctionId, app);
+		} catch (TaoLiJinCreateException e1) {
+			out.print(JsonUtil.loadFalseResult(e1.getCode(), "娣樼ぜ閲戠孩鍖呭垱寤哄け璐�"));
+			return;
 		} catch (ShareGoodsException e) {
 			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 			return;
@@ -119,10 +122,7 @@
 		data.put("link", link);
 		out.print(JsonUtil.loadTrueResult(data));
 		
-		// 1.6.5 鑷喘绔嬪噺娣诲姞 閲戝竵
-		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
-			integralGetService.addTaoLiJinBuy(uid, auctionId);
-		
+		integralGetService.addTaoLiJinBuy(uid, auctionId);
 	}
 
 	/**
@@ -288,8 +288,7 @@
 			out.print(JsonUtil.loadTrueResult(data));
 
 			// 鑾峰緱閲戝竵
-			if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
-				integralGetService.addCouponRebate(uid);
+			integralGetService.addCouponRebate(uid);
 			
 		} catch (Exception e) {
 
@@ -424,8 +423,7 @@
 		out.print(JsonUtil.loadTrueResult(""));
 		
 		// 鑾峰緱閲戝竵
-		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
-			integralGetService.addCloseRecommendGoods(uid);
+		integralGetService.addCloseRecommendGoods(uid);
 	}
 
 }

--
Gitblit v1.8.0