正式环境参数修改

admin

2018-12-04 a0a009f30e0e14907e48d6d263e12512f0ccf081

 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;

@@ -62,13 +59,16 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.log.LogHelper;

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

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

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 +103,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 +163,7 @@
   private HonestService honestService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;

@@ -206,6 +209,9 @@


   @Resource

   private MonitorService monitorService;



   @Resource

   private CommonGoodsService commonGoodsService;



   @RequestMapping(value = "getrecommendsection")

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

@@ -689,7 +695,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 +983,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 +1175,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 +1898,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 +2090,8 @@


         if (goods == null) {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);



            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

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

                     goodsList.add(gds);

                  }



               }



            }

         }