Bug修改

admin

2019-04-29 4deba4dfd79a4b8987d9750f4343facd07234040

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

@@ -55,6 +55,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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

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

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

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

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

@@ -89,6 +90,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

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

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

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

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

@@ -218,6 +220,9 @@


   @Resource

   private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



   @Resource

   private TaoBaoShopService taoBaoShopService;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -2037,7 +2042,14 @@
         }

      }

      // 店铺

      goodsJson.put("shopInfo", tbShopInfo);

      if ("android".equalsIgnoreCase(acceptData.getPlatform())&&Integer.parseInt(acceptData.getVersion()) >= 40) {

         TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());

         if (shop != null)

            goodsJson.put("shopInfo", shop);

      } else {

         goodsJson.put("shopInfo", tbShopInfo);

      }



      goodsJson.put("fanliValid", true);// 是否有返利



      // 分享路径