redis关键词

yujian

2020-01-03 c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7

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

@@ -61,7 +61,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.TBPidService;

@@ -141,7 +141,7 @@
   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private HongBaoManageService hongBaoManageService;

@@ -240,7 +240,7 @@


      LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));



      final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      // final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      // 是否在服务端进行转链

      boolean convertInServer = configService.isConvertTaoBaoLinkInServer();



@@ -309,7 +309,6 @@
      }



      if (goods != null) {

         goodsList.add(goods);

         final TaoBaoGoodsBrief newGoods = goods;

         ThreadUtil.run(new Runnable() {

            public void run() {

@@ -324,10 +323,7 @@
         });

      }



      TaoBaoGoodsBrief tb = null;

      if (goodsList.size() > 0) {

         tb = goodsList.get(0);

      }

      TaoBaoGoodsBrief tb = goods;



      if (tb == null) {

         out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

@@ -338,32 +334,50 @@
         tb.setImgList(new ArrayList<>());

      }



      tb.getImgList().add(0, tb.getPictUrl());

      // tb.getImgList().add(0, tb.getPictUrl());



      List<String> finalImgList = new ArrayList<>();

      for (String img : tb.getImgList()) {

         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));

      }



      if (finalImgList.size() == 0) {

         finalImgList.add(tb.getPictUrl());

      }



      if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))

         finalImgList.add(0, tb.getPictUrlWhite());



      // 移除相同图片

      if (finalImgList.size() > 0)

         for (int i = 0; i < finalImgList.size(); i++) {

            if (i < finalImgList.size() - 1)

               if (TbImgUtil.getTBSizeImg(finalImgList.get(i), 600)

                     .equalsIgnoreCase(TbImgUtil.getTBSizeImg(finalImgList.get(i + 1), 600))) {

                  finalImgList.remove(i--);

               }

         }



      tb.setImgList(finalImgList);



      // 大淘客商品过滤

      try {

         goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

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

            hongBaoManageService.getVIPFanLiRate());

      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());



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

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         goodsDetail.getMoneyInfo().setShareMoney(

               "¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

      }

      goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));



      if (TaoBaoUtil.isYUShou(goods)) {

         if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {

@@ -520,13 +534,12 @@
         RewardCouponVO rewardCoupon = new RewardCouponVO();

         rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));

         JSONObject params1 = new JSONObject();

         if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))

         if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))

            params1.put("url", configService.get("special_guide_reward_coupon_link"));

         else

            params1.put("url", configService.get("vip_link"));

         rewardCoupon

               .setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPFanLiRate()));

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

            rewardCoupon.setDesc("返");

            params1.put("url", configService.get("vip_link"));

            rewardCoupon.getJumpDetail().setNeedLogin(true);

@@ -611,16 +624,16 @@
      // 保存缓存

      jdGoodsCacheUtil.saveGoodsInfo(jdGoods);



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

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

            hongBaoManageService.getVIPFanLiRate());

      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         goodsDetail.getMoneyInfo()

               .setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

      }

      goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

@@ -638,13 +651,13 @@
            if (commissionShare != null && commissionShare.compareTo(threeClass.getSelfComm()) > 0) {

               jdGoods.setCommissionPlus(threeClass.getSelfComm());

               // plus返利

               BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods, fanLiRate);

               BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,

                     hongBaoManageService.getFanLiRate());

               otherInfo.setFanliMoneyPlus("京东plus返¥" + fanliMoneyPlus);

               // 使用奖励券最高返

               if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

               if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

                  maxMoneyPlus = "（京东plus返¥"

                        + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))

                        + "）";

                        + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "）";

               } else

                  maxMoneyPlus = "（京东plus最高返¥"

                        + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))

@@ -658,13 +671,13 @@
      rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);

      rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));

      JSONObject params1 = new JSONObject();

      if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))

      if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))

         params1.put("url", configService.get("special_guide_reward_coupon_link"));

      else

         params1.put("url", configService.get("vip_link"));



      rewardCoupon.setMaxMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPFanLiRate()));

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

      rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());

      if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

         rewardCoupon.setDesc("返");

         params1.put("url", configService.get("vip_link"));

         rewardCoupon.getJumpDetail().setNeedLogin(true);

@@ -807,30 +820,29 @@
         return;

      }



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

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

            hongBaoManageService.getVIPFanLiRate());

      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         goodsDetail.getMoneyInfo().setShareMoney(

               "¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

      }

      goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

      RewardCouponVO rewardCoupon = new RewardCouponVO();

      rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));

      JSONObject params1 = new JSONObject();

      if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))

      if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))

         params1.put("url", configService.get("special_guide_reward_coupon_link"));

      else

         params1.put("url", configService.get("vip_link"));



      rewardCoupon

            .setMaxMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPFanLiRate()));

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

      rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());

      if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

         rewardCoupon.setDesc("返");

         params1.put("url", configService.get("vip_link"));

         rewardCoupon.getJumpDetail().setNeedLogin(true);

@@ -981,10 +993,8 @@
               list = list.subList(0, 10);

            }



            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

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

                  hongBaoManageService.getVIPFanLiRate());

            ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());

            List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();



            for (JDGoods goods : list) {

@@ -1025,10 +1035,8 @@
                        goodsList = goodsList.subList(0, 10);

                     }



                     BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                     BigDecimal shareRate = hongBaoManageService.getShareRate();

                     ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate,

                           Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate());

                     ConfigParamsDTO paramsDTO = hongBaoManageService

                           .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());

                     for (PDDGoodsDetail goods : goodsList) {

                        listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));

                     }

@@ -1071,10 +1079,8 @@


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



            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

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

                  hongBaoManageService.getVIPFanLiRate());

            ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            goodsList.parallelStream().forEach(goods -> {

               if (goods != null) {

@@ -1352,6 +1358,7 @@


      ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),

            hongBaoManageService.getShareRate(), new BigDecimal(80), hongBaoManageService.getVIPFanLiRate());

      hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());



      if (tbGoodsList.size() > 0) {

         List<TaoBaoGoodsBrief> goodsList = null;