Merge branch 'dev1'

Administrator

2018-12-07 3b7a7eb6aa8d857dc9f2e03cd947e8f8482bf14b

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -11,6 +11,7 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -20,7 +21,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;

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

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

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

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

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

@@ -30,7 +31,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;

import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;

import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;

@@ -44,7 +45,6 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -75,7 +75,7 @@
   private SystemService systemService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private ConfigService configService;

@@ -290,7 +290,7 @@
            taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());



         if (uid != null && !"".equals(uid.trim())) {

            CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),

            CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),

                  Long.parseLong(id));

            data.put("collection", collectionGoods != null ? true : false);

         }