云发单对测试用户显示

yujian

2020-06-16 e7920b14a9baab97035a1a529da85d124a2bcacd

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -30,7 +30,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.bus.recommend.Honest;

import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;

@@ -907,7 +906,7 @@
      goods.put("zkPrice", tb.getZkPrice().toString());



      BigDecimal proportion = manageService.getFanLiRate();

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);

      goods.put("hongBao", hongBao);



      // 30天销量

@@ -1208,10 +1207,10 @@


         List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(

               StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20,

               Constant.SOURCE_TYPE_TAOBAO);

               Constant.SOURCE_TYPE_TAOBAO, true);

         long count = scanHistoryV2Service.getCountByDeviceOrUid(

               StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),

               Constant.SOURCE_TYPE_TAOBAO);

               Constant.SOURCE_TYPE_TAOBAO, true);



         JSONObject data = new JSONObject();

         data.put("count", count);

@@ -1389,7 +1388,7 @@
                  TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);

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

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

                  TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

                  vo.setLeft(goods.getLeftHongBaoCount());

                  vo.setMoney(hongBao);

@@ -2181,7 +2180,7 @@
         BigDecimal proportion = manageService.getFanLiRate();

         if ("taolijin".equalsIgnoreCase(from))

            proportion = manageService.getTLJShareRate(System.currentTimeMillis());

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);

      }

      goodsJson.put("hongBao", hongBao);



@@ -2351,7 +2350,7 @@


         fanliValid = true;

         goodsJson.put("shareValid", false);

         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false).toString();

         TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

         vo.setLeft(buyGoods.getLeftHongBaoCount());

         vo.setMoney(tljHongBao);