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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/util/cache/PinDuoDuoCacheUtil.java

@@ -7,6 +7,7 @@


import com.google.gson.Gson;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

@@ -25,7 +26,7 @@
         return;

      }

      // 保存20分钟

      String key = "PDD-goods-" + goods.getGoodsId();

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.PDDGoods, goods.getGoodsId() + "" );

      redisManager.cacheCommonString(key, new Gson().toJson(goods), 60 * 20);

   }



@@ -36,7 +37,7 @@
    * @return

    */

   public PDDGoodsDetail getGoodsInfo(long goodsId){

      String key = "PDD-goods-" + goodsId;

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.PDDGoods, goodsId + "");

      String value = redisManager.getCommonString(key);

      if (!StringUtil.isNullOrEmpty(value)) {

         return JsonUtil.getSimpleGson().fromJson(value, PDDGoodsDetail.class);