From 43ae450db3ce85b425169e4fcef6ac7c25407f52 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:47:37 +0800
Subject: [PATCH] 2.0.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index 4c6d10f..ab961a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -61,6 +61,7 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.OtherInfo;
+import com.yeshi.fanli.vo.goods.SpikeTimeVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.search.SearchKeyTOPVO;
import com.yeshi.fanli.vo.search.SearchKeyVO;
@@ -247,7 +248,14 @@
}
}
- JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+ JumpDetailV2 jumpDetail = null;
+ if(VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ jumpDetail = jumpDetailV2Service.getByTypeCache("spike_goods_list");
+ } else {
+ jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+ }
+
+
if (array == null) {
array = new JSONArray();
@@ -334,6 +342,100 @@
return root;
}
+
+
+ /**
+ * 闄愭椂绉掓潃鍒楄〃
+ * @param acceptData
+ * @param page
+ * @param auctionId
+ * @param time
+ * @param out
+ */
+ @RequestMapping("getSpikTime")
+ public void getSpikTime(AcceptData acceptData, PrintWriter out) {
+ List<SpikeTimeVO> list = new ArrayList<SpikeTimeVO>();
+ SpikeTimeVO spikeTime1 = new SpikeTimeVO();
+ spikeTime1.setTime("08:00");
+ spikeTime1.setState("杩涜涓�");
+ spikeTime1.setRequestTime("2408");
+
+ SpikeTimeVO spikeTime2 = new SpikeTimeVO();
+ spikeTime2.setTime("10:00");
+ spikeTime2.setState("杩涜涓�");
+ spikeTime2.setChecked(true);
+ spikeTime2.setRequestTime("2410");
+
+ SpikeTimeVO spikeTime3 = new SpikeTimeVO();
+ spikeTime3.setTime("13:00");
+ spikeTime3.setState("鍗冲皢寮�濮�");
+ spikeTime3.setRequestTime("2413");
+
+ SpikeTimeVO spikeTime4 = new SpikeTimeVO();
+ spikeTime4.setTime("15:00");
+ spikeTime4.setState("鍗冲皢寮�濮�");
+ spikeTime4.setRequestTime("2415");
+
+ list.add(spikeTime1);
+ list.add(spikeTime2);
+ list.add(spikeTime3);
+ list.add(spikeTime4);
+
+ JSONObject data = new JSONObject();
+ data.put("count", list.size());
+ data.put("list", list);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
+
+ /**
+ * 闄愭椂绉掓潃鍒楄〃
+ * @param acceptData
+ * @param page
+ * @param auctionId
+ * @param time
+ * @param out
+ */
+ @RequestMapping("getSpikeGoodsList")
+ public void getSpikeGoodsList(AcceptData acceptData, Integer page, Long goodsId, String qtime, PrintWriter out) {
+ List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(qtime);
+ if (detailList0 == null)
+ detailList0 = new ArrayList<>();
+
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+ detailList.addAll(detailList0);
+ JSONArray array = new JSONArray();
+ if (page == 1 && goodsId != null && detailList != null) {
+ for (int i = 0; i < detailList.size(); i++) {
+ if (detailList.get(i).getGoodsId().longValue() == goodsId) {
+ DaTaoKeDetailV2 goods = detailList.get(i);
+ detailList.remove(i);
+ detailList.add(0, goods);
+ break;
+ }
+ }
+ }
+
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ if (detailList != null) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ for (DaTaoKeDetailV2 detail : detailList) {
+ array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), null, fanLiRate, shareRate)));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", detailList.size());
+ data.put("list", array);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
+
+
/**
* 閲戝竵鍏戞崲淇℃伅
*
--
Gitblit v1.8.0