From 5eadabd0d860d09b458d6c90a8328fcc69e27880 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 13 Sep 2019 15:31:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20=E8=AE=A2=E5=8D=95=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=9C=A8=E6=9C=AC=E5=9C=B0=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index cee6d2de1..940e733dd 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -280,14 +280,13 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 	globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
 	jxStoreID := jxutils.GetShowStoreIDFromOrder(order)
 	var opNumStr string
-	if time.Now().Sub(order.OrderCreatedAt) < 48*time.Hour && order.VendorID != model.VendorIDJD {
+	if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour && order.VendorID != model.VendorIDJD {
 		opNumStr = "2"
 	} else {
 		opNumStr = "2"
 	}
 
 	if jxStoreID == 0 {
-		globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", opNumStr, order.VendorOrderID, order.VendorStoreID)
 		return nil
 	}
 	orderSkus := order.Skus
@@ -384,10 +383,13 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
 	if order.VendorID != model.VendorIDJX {
 		storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
 		if err != nil {
-			globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
 			if !dao.IsNoRowsError(err) {
+				globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
 				return err
 			}
+			if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
+				globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
+			}
 			err = nil
 		} else {
 			order.JxStoreID = storeDetail.Store.ID

From 5fdbf3a1e148b2cf19b3d7733dfad8024831ad40 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 13 Sep 2019 16:14:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8DGetAndStoreCitiesShop?=
 =?UTF-8?q?s=E4=B8=AD=E5=AD=98=E5=82=A8=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=95=86=E5=BA=97=E5=87=BA=E8=AE=B0=E5=BD=95=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=AD=98=E5=9C=A8=E9=94=99=E5=87=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/netspider/netspider.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/netspider/netspider.go b/business/netspider/netspider.go
index 61d635fac..ff791a588 100644
--- a/business/netspider/netspider.go
+++ b/business/netspider/netspider.go
@@ -198,12 +198,17 @@ func GetAndStoreCitiesShops(ctx *jxcontext.Context, vendorIDs []int, cityCodeLis
 					}
 				}()
 				for _, v := range shopList {
+					globals.SugarLogger.Debugf("GetAndStoreCitiesShops cityCode:%d, 平台:%s, shopID:%s, districtCode:%d", cityCode, model.VendorChineseNames[v.VendorID], v.VendorStoreID, v.DistrictCode)
 					if v.DistrictCode > 0 {
 						tmpShop := *v
 						dao.DeleteEntity(db, &tmpShop, model.FieldVendorStoreID, model.FieldVendorID)
 					}
-					if err = dao.CreateEntity(db, v); err != nil && !dao.IsDuplicateError(err) {
-						break
+					if err = dao.CreateEntity(db, v); err != nil {
+						if dao.IsDuplicateError(err) {
+							err = nil
+						} else {
+							break
+						}
 					}
 				}
 				if err != nil {