Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java

@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

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

import com.yeshi.fanli.log.LogHelper;

@@ -58,16 +59,18 @@
         return;

      }



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() +"");

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() + "");

      String token = null;

      token = redisManager.getCommonString(key);

      if (StringUtil.isNullOrEmpty(token)) {

         try {

            String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",

                  info.getRelationId());

            TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",

                  "1574926757600", info.getRelationId());

            String link = dto.getShort_click_url();



            if (!StringUtil.isNullOrEmpty(link)) {

               token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",

                     "【天猫双12】上亿红包等你来拆！", link);

               token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "【天猫双12】上亿红包等你来拆！",

                     link);

               if (!StringUtil.isNullOrEmpty(token))

                  redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缓存1天

            }

@@ -115,11 +118,12 @@
         token = redisManager.getCommonString(key);

      if (StringUtil.isNullOrEmpty(token)) {

         try {

            String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",

                  info.getRelationId());

            TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",

                  "1574926757600", info.getRelationId());

            String link = dto.getShort_click_url();

            if (!StringUtil.isNullOrEmpty(link)) {

               token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",

                     "预售商品付定金，得奖金！", link);

               token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "预售商品付定金，得奖金！",

                     link);

               if (Constant.IS_OUTNET)

                  if (!StringUtil.isNullOrEmpty(token))

                     redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缓存1天