yujian
2019-08-16 fb5a8918a7983bbdf83586f773884d3961bb3c6d
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -235,18 +235,23 @@
         return;
      }
      if (tb != null) {
         commonGoods = new CommonGoods();
         commonGoods.setPrice(tb.getZkPrice());
         commonGoods.setTitle(tb.getTitle());
         commonGoods.setGoodsId(tb.getAuctionId());
         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
         commonGoods.setPicture(tb.getPictUrl());
      }
      JSONObject data = new JSONObject();
      
      if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
         if (tb != null) {
            TaoBaoGoodsBrief goodsBrief = null;
            try {
               goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
            } catch (TaobaoGoodsDownException e) {
               e.printStackTrace();
            }
            if (goodsBrief == null) {
               out.println(JsonUtil.loadFalseResult("暂未找到该商品,请稍后再试!"));
               return;
            }
            commonGoods = CommonGoodsFactory.create(goodsBrief);
         }
         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
         BigDecimal shareRate = hongBaoManageService.getShareRate();
         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -257,6 +262,15 @@
         return;
      }
      
      if (tb != null) {
         commonGoods = new CommonGoods();
         commonGoods.setPrice(tb.getZkPrice());
         commonGoods.setTitle(tb.getTitle());
         commonGoods.setGoodsId(tb.getAuctionId());
         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
         commonGoods.setPicture(tb.getPictUrl());
      }
      JSONObject taoBaoGoodsJSON = new JSONObject();
      taoBaoGoodsJSON.put("title", commonGoods.getTitle());
      taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");