From fb5a8918a7983bbdf83586f773884d3961bb3c6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 17:50:56 +0800
Subject: [PATCH] 口令领取+消息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index a8633b1..030f0bb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -235,18 +235,23 @@
 			return;
 		}
 
-		if (tb != null) {
-			commonGoods = new CommonGoods();
-			commonGoods.setPrice(tb.getZkPrice());
-			commonGoods.setTitle(tb.getTitle());
-			commonGoods.setGoodsId(tb.getAuctionId());
-			commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-			commonGoods.setPicture(tb.getPictUrl());
-		}
 
 		JSONObject data = new JSONObject();
 		
 		if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+			if (tb != null) {
+				TaoBaoGoodsBrief goodsBrief = null;
+				try {
+					goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
+				} catch (TaobaoGoodsDownException e) {
+					e.printStackTrace();
+				}
+				if (goodsBrief == null) {
+					out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
+					return;
+				}
+				commonGoods = CommonGoodsFactory.create(goodsBrief);
+			}
 			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
 			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -257,6 +262,15 @@
 			return;
 		}
 		
+		if (tb != null) {
+			commonGoods = new CommonGoods();
+			commonGoods.setPrice(tb.getZkPrice());
+			commonGoods.setTitle(tb.getTitle());
+			commonGoods.setGoodsId(tb.getAuctionId());
+			commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+			commonGoods.setPicture(tb.getPictUrl());
+		}
+		
 		JSONObject taoBaoGoodsJSON = new JSONObject();
 		taoBaoGoodsJSON.put("title", commonGoods.getTitle());
 		taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");

--
Gitblit v1.8.0