红包领取

yujian

2019-11-07 3f76ec837b343e5a8538f2ce50010714d16cdeef

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

@@ -27,14 +27,12 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;

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

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

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

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



import net.sf.json.JSONObject;

@@ -48,9 +46,6 @@


   @Resource

   private SuperRecommendBannerService superRecommendBannerService;



   @Resource

   private SuperRecommendSectionService superRecommendSectionService;



   @Resource

   private HongBaoManageService hongBaoManageService;

@@ -141,8 +136,8 @@
    */



   @RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, String callback,

         PrintWriter out) {

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType, 
         String callback, PrintWriter out) {

      long begin = java.lang.System.currentTimeMillis();

      if (StringUtil.isNullOrEmpty(id)) {

         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

@@ -186,7 +181,7 @@


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

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

                  Long.parseLong(id));

                  Long.parseLong(id), goodsType);

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

         }

         taoBaoGoodsBriefExtra.setAuctionUrl(null);