商品最高返

yujian

2019-10-29 9b55262bb45c81c997ab04e55e8de13e14b8ca7d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -16,6 +16,7 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.jd.JDSearchResult;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

@@ -281,8 +282,7 @@
            if (taoBaoGoodsBrief == null) {

               continue;

            }

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,

                  shareRate);

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE));



            JSONObject params = new JSONObject();

            params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());

@@ -422,8 +422,10 @@
      if (detailList != null) {

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

          ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



         for (DaTaoKeDetailV2 detail : detailList) {

            array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), null, fanLiRate, shareRate)));

            array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), paramsDTO)));

         }

      }



@@ -569,8 +571,10 @@


         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

          ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



         for (TaoBaoGoodsBrief goods : goodsList) {

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

            if (page < 3)

               detailVO.setRecommend(true);



@@ -583,12 +587,12 @@


         if (page == 1) {

            List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());

            if (list != null && list.size() > 0)

            if (list != null && list.size() > 0) {

               BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

                ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE);

               for (int i = list.size() - 1; i >= 0; i--) {

                  TLJBuyGoods goods = list.get(i);

                  BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy,

                        rateBuy);

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);



                  String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

@@ -608,6 +612,7 @@
                  detailVO.setRecommend(true);

                  array.add(0, gson.toJson(detailVO));

               }

            }

         }



         JSONObject data = new JSONObject();

@@ -642,15 +647,14 @@
               if (gList != null) {

                  BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                  BigDecimal shareRate = hongBaoManageService.getShareRate();



                   ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                  for (TaoBaoGoodsBrief goods : gList) {

                     if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                           && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                           && goods.getBiz30day() > 1000

                           && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {



                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,

                              shareRate);

                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

                        detailVO.setRecommend(true);

                        goodsList.add(detailVO);

                     }

@@ -716,10 +720,12 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

               array.add(gson.toJson(goodsDetailVO));

            }

         }

@@ -748,9 +754,10 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

               array.add(gson.toJson(goodsDetailVO));

            }

         }

@@ -782,6 +789,7 @@
            count = arrayKeys.size();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



            int j = 1;

            for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {

@@ -794,8 +802,7 @@
               List<DaTaoKeDetailV2> listTaoKe = daTaoKeGoodsService.getSearchDiscoveryGoods(words);

               if (listTaoKe != null && listTaoKe.size() > 0) {

                  for (DaTaoKeDetailV2 daTaoKeDetailV2 : listTaoKe) {

                     listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null,

                           fanLiRate, shareRate));

                     listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), paramsDTO));

                     if (listGoods.size() >= 3)

                        break;

                  }