版本不同性别Redis缓存

yujian

2020-01-08 ae0e155d723c6b955e4632b868703eb7c282503d

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

@@ -36,6 +36,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.ShareGoodsTextTemplate;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

@@ -273,9 +274,9 @@
         TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);



         if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {

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

                  hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,

                  hongBaoManageService.getVIPFanLiRate());

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

                  acceptData.getVersion());



            GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);

            shareInfo.setGoodsInfo(goodsInfo);

         }

@@ -291,10 +292,10 @@


         shareInfo.setClickUrl(url);

         shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         shareInfo.setRule(configService.get("share_single_goods_rule"));

         shareInfo.setRule(configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));

         shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         String commentTextStr = configService.get("share_single_goods_comment_text");

         String commentTextStr = configService.get(ConfigKeyEnum.shareSingleGoodsCommentText.getKey());

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

         if (!StringUtil.isNullOrEmpty(commentTextStr)) {

            JSONArray array = JSONArray.fromObject(commentTextStr);

@@ -322,14 +323,14 @@
         if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

            String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

            if (StringUtil.isNullOrEmpty(text))

               text = configService.get("goods_share_text_nocoupon");

               text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());

            shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()).replace("{商品原价}",

                  MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "");

         } else// 有券

         {

            String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);

            if (StringUtil.isNullOrEmpty(text))

               text = configService.get("goods_share_text_coupon");

               text = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());



            shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle())

                  .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")

@@ -352,18 +353,20 @@
         // 测试

         // 2.0.2之前

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

            shareInfo.setClickUrl(getERCodeContent(configService.get("taobao_share_qrcode_text"), taoBaoLink.getGoods(), shareInfo.getToken()));

            shareInfo.setClickUrl(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),

                  taoBaoLink.getGoods(), shareInfo.getToken()));



         shareInfo.setWxErCode(getERCodeContent(configService.get("taobao_share_qrcode_text"), taoBaoLink.getGoods(), shareInfo.getToken()));

         shareInfo.setWxErCode(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), taoBaoLink.getGoods(),

               shareInfo.getToken()));



         // 提示图文内容

         String imgs = configService.get("goods_share_notify_imgs");

         String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());

         JSONArray array = JSONArray.fromObject(imgs);

         int p = (int) (array.size() * Math.random());

         if (p < array.size()) {

            shareInfo.setNotifyPicture(array.optString(p));

         }

         shareInfo.setNotifyDesc(configService.get("goods_share_notify"));

         shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));



         // 分享金额

         BigDecimal rate = hongBaoManageService.getShareRate();

@@ -383,7 +386,8 @@
            }

         }



         out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

         out.print(JsonUtil.loadTrueResult(

               JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



         final TaoBaoLink taobaoLink = taoBaoLink;

         // 异步操作

@@ -401,7 +405,7 @@
               history.setQuanLink(taobaoLink.getCouponLink());

               history.setGoodsId(taobaoLink.getGoods().getAuctionId());

               history.setPostPicture(taobaoLink.getGoods().getPictUrl());



               history.setShareImg(taobaoLink.getClickUrl());

               List<String> imgList = taobaoLink.getGoods().getImgList();

               if (imgList == null) {

                  imgList = new ArrayList<>();

@@ -502,7 +506,7 @@
            }

         }

         shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         shareInfo.setRule(configService.get("share_single_goods_rule"));

         shareInfo.setRule(configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));

         shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(goods.getPictUrl(), 500));



         // 无券

@@ -513,7 +517,7 @@
         if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {

            String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

            if (StringUtil.isNullOrEmpty(text))

               text = configService.get("goods_share_text_nocoupon");

               text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());

            shareText = text.replace("{标题}", goods.getTitle()).replace("{商品原价}",

                  MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");

         } else// 有券

@@ -540,13 +544,13 @@


         shareInfo.setDescText(descText);



         String imgs = configService.get("goods_share_notify_imgs");

         String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());

         JSONArray array = JSONArray.fromObject(imgs);

         int p = (int) (array.size() * Math.random());

         if (p < array.size()) {

            shareInfo.setNotifyPicture(array.optString(p));

         }

         shareInfo.setNotifyDesc(configService.get("goods_share_notify"));

         shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));



         // 添加分享记录

         BigDecimal rate = hongBaoManageService.getShareRate();

@@ -582,7 +586,7 @@
               history.setQuanLink(taobaoLink.getCouponLink());

               history.setGoodsId(finalGoods.getAuctionId());

               history.setPostPicture(finalGoods.getPictUrl());



               history.setShareImg(taobaoLink.getClickUrl());

               List<String> imgList = finalGoods.getImgList();

               if (imgList == null) {

                  imgList = new ArrayList<>();

@@ -636,16 +640,13 @@
      ShareInfoVO shareInfo = new ShareInfoVO();

      shareInfo.setClickUrl(jumpLink);

      shareInfo.setWxErCode(jumpLink);

      shareInfo.setRule(configService.get("share_rule_link_jd"));

      shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkJD.getKey()));

      shareInfo.setPictUrl(jdGoods.getPicUrl());

      shareInfo.setCommentTexts(new ArrayList<>());



      if (needGoods)

         shareInfo

               .setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,

                     new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),

                           hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,

                           hongBaoManageService.getVIPFanLiRate())));

         shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,

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



      String shareText = "";

      boolean hasCoupon = false;

@@ -657,14 +658,14 @@
            shareText = textTemplate.getShareJDTextTemplate();



         if (StringUtil.isNullOrEmpty(shareText))

            shareText = configService.get("goods_share_text_nocoupon_jd");

            shareText = configService.get(ConfigKeyEnum.goodsShareTextNoCouponJD.getKey());

      } else { // 有券模板

         hasCoupon = true;

         if (textTemplate != null)

            shareText = textTemplate.getShareJDTextTemplateCoupon();



         if (StringUtil.isNullOrEmpty(shareText))

            shareText = configService.get("goods_share_text_coupon_jd");

            shareText = configService.get(ConfigKeyEnum.goodsShareTextCouponJD.getKey());

      }

      shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, jumpLink,

            hasCoupon);

@@ -676,13 +677,13 @@
      }

      shareInfo.setDescText(descText);



      String imgs = configService.get("goods_share_notify_imgs");

      String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());

      JSONArray array = JSONArray.fromObject(imgs);

      int p = (int) (array.size() * Math.random());

      if (p < array.size()) {

         shareInfo.setNotifyPicture(array.optString(p));

      }

      shareInfo.setNotifyDesc(configService.get("goods_share_notify_jd"));

      shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotifyJD.getKey()));



      // 添加分享记录

      BigDecimal shareRate = hongBaoManageService.getShareRate();

@@ -699,7 +700,8 @@
            e1.printStackTrace();

         }

      }

      out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

      out.print(JsonUtil.loadTrueResult(

            JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



      // 异步操作

      final JDGoods goods = jdGoods;

@@ -717,7 +719,8 @@
            history.setQuanLink(null);

            history.setGoodsId(goodsId);

            history.setPostPicture(goods.getPicUrl());



            history.setShareImg(jumpLink);

				
            List<String> imgList = goods.getImageList();

            if (imgList == null) {

               imgList = new ArrayList<>();

@@ -757,7 +760,7 @@
      shareInfo.setClickUrl(jumpLink);

      shareInfo.setWxErCode(jumpLink);

      shareInfo.setCommentTexts(new ArrayList<>());

      shareInfo.setRule(configService.get("share_rule_link_pdd"));

      shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkPDD.getKey()));

      shareInfo.setPictUrl(goods.getGoodsImageUrl());

      if (needGoods) {

         shareInfo

@@ -775,14 +778,14 @@
            template = textTemplate.getSharePDDTextTemplate();



         if (StringUtil.isNullOrEmpty(template))

            template = configService.get("goods_share_text_nocoupon_pdd");

            template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());

      } else {

         hasCoupon = true;

         if (textTemplate != null)

            template = textTemplate.getSharePDDTextTemplateCoupon();



         if (StringUtil.isNullOrEmpty(template))

            template = configService.get("goods_share_text_coupon_pdd");

            template = configService.get(ConfigKeyEnum.goodsShareTextCouponPDD.getKey());

      }



      // 创建口令

@@ -800,13 +803,13 @@
      shareInfo.setDescText(descText);



      //

      String imgs = configService.get("goods_share_notify_imgs");

      String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());

      JSONArray array = JSONArray.fromObject(imgs);

      int p = (int) (array.size() * Math.random());

      if (p < array.size()) {

         shareInfo.setNotifyPicture(array.optString(p));

      }

      shareInfo.setNotifyDesc(configService.get("goods_share_notify_pdd"));

      shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotifyPDD.getKey()));



      // 添加分享记录

      BigDecimal shareRate = hongBaoManageService.getShareRate();

@@ -824,7 +827,8 @@
            e1.printStackTrace();

         }

      }

      out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

      out.print(JsonUtil.loadTrueResult(

            JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



      // 异步操作

      com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {

@@ -841,7 +845,7 @@
            history.setQuanLink(null);

            history.setGoodsId(goodsId);

            history.setPostPicture(goods.getGoodsImageUrl());



            history.setShareImg(jumpLink);

            List<String> imgList = null;

            String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();

            if (goodsGalleryUrls != null) {

@@ -1143,13 +1147,13 @@
            } else {

               template = shareGoodsTextTemplateService.geteCouponTemplate(uid);

               if (StringUtil.isNullOrEmpty(template))

                  template = configService.get("goods_share_text_coupon");

                  template = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());

            }



         } else {

            template = shareGoodsTextTemplateService.getCommonTemplate(uid);

            if (StringUtil.isNullOrEmpty(template))

               template = configService.get("goods_share_text_nocoupon");

               template = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());

         }

      } else if (goodsType == Constant.SOURCE_TYPE_JD) {

         ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);

@@ -1158,7 +1162,7 @@
               template = textTemplate.getShareJDTextTemplateCoupon();

            }

            if (StringUtil.isNullOrEmpty(template)) {

               template = configService.get("goods_share_text_coupon_jd");

               template = configService.get(ConfigKeyEnum.goodsShareTextCouponJD.getKey());

            }

         } else {

            if (textTemplate != null) {

@@ -1166,7 +1170,7 @@
            }



            if (StringUtil.isNullOrEmpty(template)) {

               template = configService.get("goods_share_text_nocoupon_jd");

               template = configService.get(ConfigKeyEnum.goodsShareTextNoCouponJD.getKey());

            }

         }

      } else if (goodsType == Constant.SOURCE_TYPE_PDD) {

@@ -1176,7 +1180,7 @@
               template = textTemplate.getSharePDDTextTemplateCoupon();

            }

            if (StringUtil.isNullOrEmpty(template)) {

               template = configService.get("goods_share_text_coupon_pdd");

               template = configService.get(ConfigKeyEnum.goodsShareTextCouponPDD.getKey());

            }

         } else {

            if (textTemplate != null) {

@@ -1184,7 +1188,7 @@
            }



            if (StringUtil.isNullOrEmpty(template)) {

               template = configService.get("goods_share_text_nocoupon_pdd");

               template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());

            }

         }

      }

@@ -1235,12 +1239,12 @@
            out.print(

                  JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules", new Date())));

         } else {

            out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules")));

            out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRules.getKey())));

         }

      } else if (goodsType == Constant.SOURCE_TYPE_JD) {

         out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules_jd")));

         out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRulesJD.getKey())));

      } else if (goodsType == Constant.SOURCE_TYPE_PDD) {

         out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules_pdd")));

         out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRulesPDD.getKey())));

      }

   }



@@ -1413,10 +1417,8 @@
         }

      }



      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());



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

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