admin
2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -162,20 +162,21 @@
         BigDecimal fanliMoney) {
      List<ShareGoodsCommentChoiceInfo> list = new ArrayList<>();
      if (!StringUtil.isNullOrEmpty(token))
         list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_TOKEN, "淘口令", token, true, false));
         list.add(
               new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_TOKEN, "淘口令", token, true, false));
      if (!StringUtil.isNullOrEmpty(link)) {
         list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_LINK, "链接",link, true, false));
         list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_LINK, "链接", link, true, false));
      }
      if (!StringUtil.isNullOrEmpty(inviteCode)) {
         list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_INVITE_CODE, "邀请码", inviteCode, false,
               true));
         list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_INVITE_CODE, "邀请码", inviteCode,
               false, true));
      }
      list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_DOWNLOAD_LINK, "下载链接", "http://www.baidu.com", false,
            true));
      list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_DOWNLOAD_LINK, "下载链接",
            "http://www.baidu.com", false, true));
      list.add(
            new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_FANLI_MONEY, "返利金额", "¥ "+fanliMoney, false, true));
      list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_FANLI_MONEY, "返利金额",
            "¥ " + fanliMoney, false, true));
      return list;
   }
@@ -561,7 +562,8 @@
               taoBaoLink.getGoods(), shareInfo.getToken()));
         // 提示图文内容
         String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
         String imgs =  configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), platform,
               Integer.parseInt(version));
         JSONArray array = JSONArray.fromObject(imgs);
         int p = (int) (array.size() * Math.random());
         if (p < array.size()) {
@@ -703,7 +705,8 @@
      }
      shareInfo.setDescText(descText);
      String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
      String imgs = configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), acceptData.getPlatform(),
            Integer.parseInt(acceptData.getVersion()));
      JSONArray array = JSONArray.fromObject(imgs);
      int p = (int) (array.size() * Math.random());
      if (p < array.size()) {
@@ -732,7 +735,7 @@
      // 设置评论文本选项
      shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getClickUrl(), inviteCode,
            JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getFanLiRate())));
      shareInfo.setCommentText(shareInfo.getShareText());
      shareInfo.setRecommendText(shareInfo.getDescText());
@@ -839,7 +842,8 @@
      shareInfo.setDescText(descText);
      //
      String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
      String imgs =  configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), acceptData.getPlatform(),
            Integer.parseInt(acceptData.getVersion()));
      JSONArray array = JSONArray.fromObject(imgs);
      int p = (int) (array.size() * Math.random());
      if (p < array.size()) {
@@ -869,7 +873,7 @@
      // 设置评论文本选项
      shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getClickUrl(), inviteCode,
            PinDuoDuoUtil.getGoodsFanLiMoney(goods, hongBaoManageService.getFanLiRate())));
      shareInfo.setCommentText(shareInfo.getShareText());
      shareInfo.setRecommendText(shareInfo.getDescText());