From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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..dbde4ce 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())
@@ -255,6 +260,15 @@
data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
out.print(JsonUtil.loadTrueResult(data));
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();
@@ -319,7 +333,7 @@
/**
- *
+ * 鍙ｄ护棰嗗彇
* @param acceptData
* @param kw
* @param goodsType
@@ -328,8 +342,8 @@
@RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
try {
- tokenRecordService.receiveToken(token, uid);
- out.print(JsonUtil.loadTrueResult("棰嗗彇鎴愬姛"));
+ String msg = tokenRecordService.receiveToken(token, uid);
+ out.print(JsonUtil.loadTrueResult(msg));
} catch (TokenRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
--
Gitblit v1.8.0