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

同步银豹到京西测试

Browse Source
This commit is contained in:
苏尹岚
2020-04-29 09:55:17 +08:00
parent 2a6ccc6f93
commit b116cdb5d6
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/partner.go
View File

@@ -114,7 +114,7 @@ type IOrderManager interface {
GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isNotEnded, isGetPos bool) (bills []*model.WaybillExt, err error) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isNotEnded, isGetPos bool) (bills []*model.WaybillExt, err error)
ChangeOrderInfo(order *model.GoodsOrder) (err error) ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error)
// afs order // afs order
OnAfsOrderAdjust(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error) OnAfsOrderAdjust(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)
OnAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error) OnAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)

26
business/partner/purchase/jd/order.go
View File

@@ -124,7 +124,8 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
order, _, err := c.getOrder(a, msg.BillID) order, _, err := c.getOrder(a, msg.BillID)
if err == nil { if err == nil {
globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID) globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID)
partner.CurOrderManager.ChangeOrderInfo(order) valid := orderInfoChangeSet(order, msg)
partner.CurOrderManager.ChangeOrderInfo(order, valid)
} }
return retVal return retVal
} }
@@ -557,3 +558,26 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G
} }
return err return err
} }
func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoChangeMsg) (valid map[string]interface{}) {
valid = make(map[string]interface{})
if msg.BuyerFullAddress != "" {
valid["consigneeAddress"] = msg.BuyerFullAddress
}
if msg.BuyerFullName != "" {
valid["consigneeName"] = msg.BuyerFullName
}
if msg.BuyerMobile != "" {
valid["consigneeMobile"] = msg.BuyerMobile
}
if msg.BuyerLat != 0 {
valid["consigneeLat"] = jxutils.StandardCoordinate2Int(msg.BuyerLat)
}
if msg.BuyerLng != 0 {
valid["consigneeLng"] = jxutils.StandardCoordinate2Int(msg.BuyerLng)
}
if msg.OrderBuyerRemark != "" {
valid["buyerComment"] = msg.OrderBuyerRemark
}
return valid
}

2
controllers/cms_sync.go
View File

@@ -361,7 +361,7 @@ func (c *SyncController) SyncStoreSkusFromYb() {
c.callSyncStoreSkusFromYb(func(params *tSyncSyncStoreSkusFromYbParams) (retVal interface{}, errCode string, err error) { c.callSyncStoreSkusFromYb(func(params *tSyncSyncStoreSkusFromYbParams) (retVal interface{}, errCode string, err error) {
var storeIDs []int var storeIDs []int
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err == nil { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err == nil {
cms.CurVendorSync.SyncStoreSkusFromYb(params.Ctx, storeIDs, params.IsAsync, params.IsContinueWhenError) retVal, err = cms.CurVendorSync.SyncStoreSkusFromYb(params.Ctx, storeIDs, params.IsAsync, params.IsContinueWhenError)
} }
return retVal, "", err return retVal, "", err
}) })