liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-16 08:47:20 +08:00
parent 3aa9234b68 5fdbf3a1e1
commit 22f8d169d0
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/order.go
View File

@@ -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) globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
jxStoreID := jxutils.GetShowStoreIDFromOrder(order) jxStoreID := jxutils.GetShowStoreIDFromOrder(order)
var opNumStr string 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" opNumStr = "2"
} else { } else {
opNumStr = "2" opNumStr = "2"
} }
if jxStoreID == 0 { if jxStoreID == 0 {
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", opNumStr, order.VendorOrderID, order.VendorStoreID)
return nil return nil
} }
orderSkus := order.Skus orderSkus := order.Skus
@@ -384,10 +383,13 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
if order.VendorID != model.VendorIDJX { if order.VendorID != model.VendorIDJX {
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID) storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
if err != nil { if err != nil {
globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
if !dao.IsNoRowsError(err) { if !dao.IsNoRowsError(err) {
globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
return 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 err = nil
} else { } else {
order.JxStoreID = storeDetail.Store.ID order.JxStoreID = storeDetail.Store.ID

7
business/netspider/netspider.go
View File

@@ -198,14 +198,19 @@ func GetAndStoreCitiesShops(ctx *jxcontext.Context, vendorIDs []int, cityCodeLis
} }
}() }()
for _, v := range shopList { 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 { if v.DistrictCode > 0 {
tmpShop := *v tmpShop := *v
dao.DeleteEntity(db, &tmpShop, model.FieldVendorStoreID, model.FieldVendorID) dao.DeleteEntity(db, &tmpShop, model.FieldVendorStoreID, model.FieldVendorID)
} }
if err = dao.CreateEntity(db, v); err != nil && !dao.IsDuplicateError(err) { if err = dao.CreateEntity(db, v); err != nil {
if dao.IsDuplicateError(err) {
err = nil
} else {
break break
} }
} }
}
if err != nil { if err != nil {
dao.Rollback(db) dao.Rollback(db)
} else { } else {