券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

 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) {