修改返回内容

Administrator

2018-12-06 e081ab5701b39578d4e6ec5096d06b5e6c56d05e

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

@@ -41,12 +41,13 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

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

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

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

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

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

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

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

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

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

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

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

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

@@ -68,7 +69,8 @@
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

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.CommonGoodsService;

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

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

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

@@ -91,6 +93,7 @@
import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.ShareManageService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -160,7 +163,7 @@
   private HonestService honestService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;

@@ -207,6 +210,12 @@
   @Resource

   private MonitorService monitorService;



   @Resource

   private CommonGoodsService commonGoodsService;

	
   @Resource

   private UserGoodsStorageService userGoodsStorageService;

 
   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {



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

         taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());

         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);

         }

@@ -977,7 +986,7 @@


      // 判断收藏

      if (!StringUtil.isNullOrEmpty(uid)) {

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

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

               Long.parseLong(id));

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

      } else

@@ -1169,7 +1178,9 @@
         if (goods == null)// 商品下线

         {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);

            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);



            if (cgoods != null) {// 商品有本地缓存

               // 按名字搜索商品

               SearchFilter sf = new SearchFilter();

@@ -1890,7 +1901,7 @@
      if (StringUtil.isNullOrEmpty(uid)) {

         data.put("collected", false);

      } else {

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

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

               Long.parseLong(id));

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

      }

@@ -1972,6 +1983,13 @@
      // 分享路径

      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());



      // 是否加入选品库：   0未加入 1 已加入

      boolean storageState = false;

      if (uid != null && uid.trim().length() > 0) {

         storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));

      }

		
      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);

      data.put("goods", goods);

      data.put("shareUsers", listShareUser);

@@ -2082,8 +2100,8 @@


         if (goods == null) {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);



            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

@@ -2101,9 +2119,7 @@
                     }

                     goodsList.add(gds);

                  }



               }



            }

         }