From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index d9be144..de75049 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/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"));

--
Gitblit v1.8.0