Merge remote-tracking branch 'origin/div' into div

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

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

@@ -181,7 +181,6 @@
         }



         JSONObject root = new JSONObject();



         root.put("type", 2);

         JSONObject data = new JSONObject();

         data.put("title", text);

@@ -253,8 +252,15 @@
               String pddId = PinDuoDuoUtil.getPDDGoodsId(text);

               if (!StringUtil.isNullOrEmpty(pddId)) {

                  PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));

                  if (goods != null)

                  if (goods != null) {

                     commonGoods = CommonGoodsFactory.create(goods);

                  } else {

                     type = 4;

                     goods = PinDuoDuoUtil.getPDDGoodsInfo("26478646158");

                     commonGoods = new CommonGoods();

                     commonGoods.setTitle(goods.getGoodsName());

                     commonGoods.setPicture(goods.getGoodsThumbnailUrl());

                  }

               }

            }

         }