yujian
2019-05-13 efdac57e87ef0ca1a525d13bb5b742c560607ae2
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) {
@@ -1728,10 +1733,18 @@
         // 缓存半个小时
         redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
      }
      Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
      JSONObject params = new JSONObject();
      params.put("url", configService.get("spike_goods_link"));
      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
      JSONObject root = new JSONObject();
      root.put("time", nextTime.getTimeInMillis());
      root.put("endTime", endTime > 0? endTime : 0);
      root.put("listgoods", array);
      root.put("params", params);
      root.put("jumpDetail", jumpDetail);
      out.print(JsonUtil.loadTrueResult(root));
   }
@@ -1911,9 +1924,11 @@
      goodsJson.put("price", tb.getReservePrice().toString());
      goodsJson.put("zkPrice", tb.getZkPrice().toString());
      // 30天销量
      goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
      goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
      // 分享赚
      BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
      data.put("shareMoney", "¥" + shareMoney);
@@ -2005,8 +2020,8 @@
      goodsJson.put("hongBao", hongBao);
      List<ClientTextStyleVO> labels = new ArrayList<>();
      labels.add(new ClientTextStyleVO("标签测试内容1", "#FF0000"));
      labels.add(new ClientTextStyleVO("标签测试内容2", "#00FF00"));
      labels.add(new ClientTextStyleVO("标签测试内容", "#FF0000"));
      labels.add(new ClientTextStyleVO("标签测试内容", "#00FF00"));
      goodsJson.put("labels", labels);
      data.put("tbPidInfo", clientTBPid);
@@ -2037,7 +2052,16 @@
         }
      }
      // 店铺
      goodsJson.put("shopInfo", tbShopInfo);
      if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) >= 40)
            || ("ios".equalsIgnoreCase(acceptData.getPlatform())
                  && Integer.parseInt(acceptData.getVersion()) >= 49)) {
         TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
         if (shop != null)
            goodsJson.put("shopInfo", shop);
      } else {
         goodsJson.put("shopInfo", tbShopInfo);
      }
      goodsJson.put("fanliValid", true);// 是否有返利
      // 分享路径