From ed390c70bfbafb399fe20e8b89efc02ca5be008d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 15:32:40 +0800
Subject: [PATCH] config

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 165ada6..30e7e26 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
@@ -110,8 +110,8 @@
 	 *            鍟嗗搧閾炬帴
 	 * @param out
 	 */
-	@RequestMapping(value = "getNewGoodsInfo", method = RequestMethod.POST)
-	public void getNewGoodsInfo(AcceptData acceptData, String text, PrintWriter out) {
+	@RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)
+	public void getRecommendInfo(AcceptData acceptData, String text, PrintWriter out) {
 		if (StringUtil.isNullOrEmpty(text)) {
 			out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
 			return;
@@ -195,15 +195,16 @@
 		JSONObject taoBaoGoodsJSON = new JSONObject();
 		taoBaoGoodsJSON.put("title", tb.getTitle());
 		taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
-		taoBaoGoodsJSON.put("auctionId", tb.getAuctionId());
+		taoBaoGoodsJSON.put("id", tb.getAuctionId());
+		taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
 		taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
-		data.put("taoBaoGoodsBrief", taoBaoGoodsJSON);
+		data.put("goods", taoBaoGoodsJSON);
 		if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
 			if (tb.getImgList() == null)
 				tb.setImgList(new ArrayList<>());
 			tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
 		}
-		data.put("tbImgs", tb.getImgList());
+		data.put("imgs", tb.getImgList());
 		JSONObject root = new JSONObject();
 		root.put("type", 1);
 		root.put("data", data);
@@ -591,8 +592,7 @@
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 				for (JDGoods goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
-							shareRate);
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
 					array.add(gson.toJson(goodsDetailVO));
 				}
 			}
@@ -604,7 +604,7 @@
 	}
 
 	/**
-	 * 浜笢
+	 *   鎷煎澶�
 	 * 
 	 * @param kw
 	 * @param page
@@ -668,7 +668,7 @@
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
 
 				for (PDDGoodsDetail goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate,
 							shareRate);
 					array.add(gson.toJson(goodsDetailVO));
 				}

--
Gitblit v1.8.0