From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 14 五月 2019 11:28:03 +0800 Subject: [PATCH] Merge branch 'div_12' --- fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java index 4e8981c..ef506a3 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java @@ -31,6 +31,7 @@ import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service; import com.yeshi.fanli.service.inter.goods.GoodsClassService; import com.yeshi.fanli.service.inter.goods.TaoBaoClassService; +import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.lable.LabelService; import com.yeshi.fanli.service.inter.lable.MergeClassService; @@ -56,6 +57,9 @@ @Resource private QualityFactoryService selectionGoodsService; + + @Resource + private TaoBaoGoodsBriefService taoBaoGoodsBriefService; @Resource private TaobaoMeterialService taobaoMeterialService; @@ -864,14 +868,26 @@ * @param out */ @RequestMapping("getFlashSale") - public void getFlashSale(String callback, Integer page, PrintWriter out) { + public void getFlashSale(String callback, Integer page, Long auctionId, PrintWriter out) { if (page == null) page = 1; int pageSize = Constant.PAGE_SIZE; int type = qualityFlashSaleService.getNowType(); + + TaoBaoGoodsBrief goodsBrief = null; + if (page == 1 && auctionId != null) { + List<TaoBaoGoodsBrief> list = taoBaoGoodsBriefService.queryByAuctionId(auctionId); + if (list != null && list.size() > 0) { + goodsBrief = list.get(0); + } + } + if (goodsBrief != null) { + pageSize = pageSize -1; + } + List<QualityFactory> listQuery = qualityGoodsService.listQueryByFlashSale((page - 1) * pageSize, pageSize); // 绮鹃�夊簱鏁版嵁涓虹┖ @@ -889,14 +905,21 @@ BigDecimal proportion = manageService.getFanLiRate(); + if (goodsBrief != null) { + array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null))); + } + // 閬嶅巻鍒楄〃鏁版嵁 for (QualityFactory quality : listQuery) { TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief(); - if (taoBaoGoodsBrief == null) { continue; } + + if (goodsBrief != null && auctionId.equals(taoBaoGoodsBrief.getAuctionId())) { + continue; + } int biz30day = taoBaoGoodsBrief.getBiz30day(); if (biz30day >= 10000) { -- Gitblit v1.8.0