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

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -348,6 +348,7 @@
               g.setId(goods.getAuctionId());

               g.setCreatetime(new Date());

               g.setMaterialLibType(goods.getMaterialLibType());

               g.setProvcity(goods.getProvcity());

               return g;

            }

         }

@@ -416,6 +417,7 @@
               }

               g.setCreatetime(new Date());

               g.setMaterialLibType(goods.getMaterialLibType());

               g.setProvcity(goods.getProvcity());

               return g;

            }

         }

@@ -917,6 +919,7 @@
      goods.setSellerId(item.optLong("seller_id"));

      goods.setShopTitle(item.optString("shop_title"));

      goods.setTitle(item.optString("title"));

      goods.setProvcity(item.optString("provcity"));



      if (!StringUtil.isNullOrEmpty(item.optString("level_one_category_id"))) {

         goods.setRootCatId(item.optInt("level_one_category_id"));

@@ -1838,6 +1841,7 @@
      goods.setSellerId(item.optLong("seller_id"));

      goods.setShopTitle(item.optString("shop_title"));

      goods.setTitle(item.optString("title"));

      goods.setProvcity(item.optString("provcity"));



      if (!StringUtil.isNullOrEmpty(item.optString("level_one_category_id"))) {

         goods.setRootCatId(item.optInt("level_one_category_id"));