Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-26 8c0f5b3a9955a345ec7efbc5c5cb5b3005695326

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -292,11 +292,10 @@
         data.put("goods", goodsJSON);

         out.print(JsonUtil.loadTrueResult(data));

         return;

      }

      } 
      

      

      JSONObject data = new JSONObject();



      if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

         if (tb != null) {

            TaoBaoGoodsBrief goodsBrief = null;

@@ -309,7 +308,7 @@
               out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

               return;

            }

            commonGoods = CommonGoodsFactory.create(tb);

            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }

         

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();