admin
2020-06-01 4d66b80a56cca390a0d06cc5bc5a9d8c8f790ff8
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -450,7 +450,7 @@
      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
         goodsDetail.getMoneyInfo().setShareMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods,
               hongBaoManageService.getShareRate(UserLevelEnum.superVIP),true));
               hongBaoManageService.getShareRate(UserLevelEnum.superVIP), true));
         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
         goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
      }
@@ -552,7 +552,8 @@
         shareValid = false;
         helpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());
         BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
         BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,
               false);
         ReduceHongBao reduceHongBao = new ReduceHongBao();
         reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());
@@ -854,11 +855,11 @@
      // 商品链接
      String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
            Constant.systemCommonConfig.getShareGoodsPagePathJD(), "", id + "");
      try {
         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
      } catch (Exception e) {
//      try {
//         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
//      } catch (Exception e) {
         extraVO.setH5Url(h5Url);
      }
//      }
      String helpLink = null;
      extraVO.setFanliValid(true);
@@ -1033,11 +1034,11 @@
      // 分享路径
      String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
            Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
      try {
         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
      } catch (Exception e) {
//      try {
//         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
//      } catch (Exception e) {
         extraVO.setH5Url(h5Url);
      }
//      }
      String helpLink = null;
      extraVO.setFanliValid(true);
@@ -1173,11 +1174,11 @@
      // 分享路径
      String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
            Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
      try {
         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
      } catch (Exception e) {
//      try {
//         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
//      } catch (Exception e) {
         extraVO.setH5Url(h5Url);
      }
//      }
      String helpLink = null;
      extraVO.setFanliValid(true);
@@ -1304,11 +1305,11 @@
      // 分享路径
      String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
            Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
      try {
         extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
      } catch (Exception e) {
         extraVO.setH5Url(h5Url);
      }
      // try {
      // extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
      // } catch (Exception e) {
      extraVO.setH5Url(h5Url);
      // }
      String helpLink = null;
      extraVO.setFanliValid(true);
@@ -1431,10 +1432,10 @@
            out.print(JsonUtil.loadTrueResult(data));
            return;
         }
         if (goodsType == Constant.SOURCE_TYPE_SUNING) {
            //猜你喜欢
            // 猜你喜欢
         }
         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(Long.parseLong(id), 10);
@@ -1718,8 +1719,8 @@
      String quanUrl = null;
      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl()))
         quanUrl = goods.getCouponInfo().getCouponUrl();
      String link = SuningApiUtil.convertLink(SuningUtil.getProductUrl(supplierCode, goodsCode),
            quanUrl, SuningApiUtil.PID_BUY, uid + "");
      String link = SuningApiUtil.convertLink(SuningUtil.getProductUrl(supplierCode, goodsCode), quanUrl,
            SuningApiUtil.PID_BUY, uid + "");
      JSONObject data = new JSONObject();
      data.put("native", false);
      data.put("jumpLink", link);