From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 16:41:49 +0800
Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 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 3ac27cb..2e70da5 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
@@ -21,11 +21,13 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoLink;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.exception.share.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;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
 import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
@@ -85,13 +87,20 @@
 	@Resource
 	private TLJBuyGoodsService tljBuyGoodsService;
 
-	private void doTaoLiJinBuy(Long uid, Long auctionId, PrintWriter out) {
+	@Resource
+	private IntegralGetService integralGetService;
+
+	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,
 					TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+			if (tljBuyGoods == null) {
+				out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧涓嶅瓨鍦�"));
+				return;
+			}
 			String appKey = tljBuyGoods.getAppKey();
 			TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppKeyCache(appKey);
 			if (config == null) {
@@ -100,6 +109,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;
@@ -111,6 +123,8 @@
 		data.put("type", 1);
 		data.put("link", link);
 		out.print(JsonUtil.loadTrueResult(data));
+
+		integralGetService.addTaoLiJinBuy(uid, auctionId);
 	}
 
 	/**
@@ -157,7 +171,7 @@
 		}
 
 		if ("taolijin_buy".equalsIgnoreCase(source)) {
-			doTaoLiJinBuy(uid, auctionId, out);
+			doTaoLiJinBuy(acceptData, uid, auctionId, out);
 			return;
 		}
 
@@ -274,6 +288,9 @@
 			data.put("type", 1);
 			data.put("link", link);
 			out.print(JsonUtil.loadTrueResult(data));
+
+			// 鑾峰緱閲戝竵
+			integralGetService.addCouponRebate(uid);
 
 		} catch (Exception e) {
 
@@ -406,6 +423,9 @@
 		history.setGoodsId(goodsId);
 		recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);
 		out.print(JsonUtil.loadTrueResult(""));
+
+		// 鑾峰緱閲戝竵
+		integralGetService.addCloseRecommendGoods(uid);
 	}
 
 }

--
Gitblit v1.8.0