From 534e0d10fdedf5fdaba6f63c99605520314a97d4 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 27 六月 2019 15:39:31 +0800 Subject: [PATCH] 分享爆品修改 --- fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java index c55a67c..3f4ded1 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.JsonUtil; +import com.google.gson.Gson; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.taobao.ShareHotGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -48,25 +49,16 @@ * @param out */ @RequestMapping(value = "listPreGoods", method = RequestMethod.GET) - public void getSugguestSearch(String callback, AcceptData acceptData, String kw, PrintWriter out) { + public void listPreGoods(String callback, AcceptData acceptData, String kw, PrintWriter out) { // 澶ф窐瀹㈡暟鎹紝鏇存柊 - - List<String> list = TaoBaoUtil.getSuguestSearch(kw); - if (list != null && list.size() > 0) { - JSONArray array = new JSONArray(); - int num = 0; - for (String st : list) { - array.add(st); - num = num + 1; - if (num >= 5) { - break; - } - } - out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array))); - } else { - out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(""))); + List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods(); + BigDecimal rate = hongBaoManageService.getFanLiRate(); + JSONArray array = new JSONArray(); + Gson gson = new Gson(); + for (TaoBaoGoodsBrief goods : list) { + array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null))); } - return; + out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array))); } /** @@ -92,10 +84,15 @@ } catch (TaobaoGoodsDownException e) { e.printStackTrace(); } - if (goods != null) { - count++; - goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods); - shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods)); + if (goods != null && goods.getCouponAmount() != null + && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) { + + if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate()) + .compareTo(new BigDecimal("734")) >= 0) { + count++; + goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods); + shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods)); + } } } out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("璁剧疆鎴愬姛:" + count))); -- Gitblit v1.8.0