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 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 {