Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-22 004fdfb7f9c02e69b1a5dd4add1461bd4ce83855

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -2121,7 +2121,8 @@
         }



         String token = "";

         if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {

         if (!StringUtil.isNullOrEmpty(tb.getCouponLink())

               && VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

            token = redisManager.getCommonTaoToken(tb.getAuctionId());

            if (StringUtil.isNullOrEmpty(token)) {

               token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());