yujian
2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3
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())
@@ -255,6 +260,15 @@
         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
         out.print(JsonUtil.loadTrueResult(data));
         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();
@@ -319,7 +333,7 @@
   
   /**
    *
    * 口令领取
    * @param acceptData
    * @param kw
    * @param goodsType
@@ -328,8 +342,8 @@
   @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
   public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
      try {
         tokenRecordService.receiveToken(token, uid);
         out.print(JsonUtil.loadTrueResult("领取成功"));
         String msg = tokenRecordService.receiveToken(token, uid);
         out.print(JsonUtil.loadTrueResult(msg));
      } catch (TokenRecordException e) {
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
      }