admin
2018-12-05 eb8704f0218814f4c3ebfd0a1a6f5dbbb26db8d1
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -12,9 +12,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -41,12 +38,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 +66,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;
@@ -103,6 +102,9 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user")
@@ -160,7 +162,7 @@
   private HonestService honestService;
   @Resource
   private CollectionGoodsService collectionGoodsService;
   private CollectionGoodsV2Service collectionGoodsV2Service;
   @Resource
   private HongBaoManageMapper hongBaoManageMapper;
@@ -206,6 +208,9 @@
   @Resource
   private MonitorService monitorService;
   @Resource
   private CommonGoodsService commonGoodsService;
   @RequestMapping(value = "getrecommendsection")
   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -689,7 +694,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 +982,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 +1174,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 +1897,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);
      }
@@ -2082,8 +2089,8 @@
         if (goods == null) {
            // 从我们的商品库搜索
            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
                  CommonGoods.GOODS_TYPE_TB);
            // 商品有本地缓存
            if (cgoods != null) {
               // 按名字搜索商品
@@ -2101,9 +2108,7 @@
                     }
                     goodsList.add(gds);
                  }
               }
            }
         }