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

京东api区分vendorOrgCode

Browse Source
This commit is contained in:
gazebo
2019-12-09 15:16:21 +08:00
parent 211994bd97
commit ecedbe9be4
37 changed files with 172 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/purchase/elm/order.go
View File

@@ -123,7 +123,7 @@ func (c *PurchaseHandler) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancel
return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus)
}
func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
func (c *PurchaseHandler) GetOrder(vendorOrgCode, orderID string) (order *model.GoodsOrder, err error) {
result, err := api.ElmAPI.GetOrder(orderID)
if err == nil {
order = c.Map2Order(result)
@@ -200,7 +200,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
//
func (c *PurchaseHandler) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
// todo 这里应该可以直接用msg里的内容，而不用再次去查
order, err := c.GetOrder(msg["orderId"].(string))
order, err := c.GetOrder("", msg["orderId"].(string))
if err == nil {
order.VendorStatus = c.stateAndType2Str(order.VendorStatus, elmapi.MsgTypeOrderValid)
err = partner.CurOrderManager.OnOrderNew(order, nil)

2
business/partner/purchase/elm/order_comment.go
View File

@@ -5,6 +5,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model"
)
func (c *PurchaseHandler) ReplyOrderComment(ctx *jxcontext.Context, orderComment *model.OrderComment, replyComment string) (err error) {
func (c *PurchaseHandler) ReplyOrderComment(ctx *jxcontext.Context, vendorOrgCode string, orderComment *model.OrderComment, replyComment string) (err error) {
return err
}

2
business/partner/purchase/elm/order_test.go
View File

@@ -13,7 +13,7 @@ func init() {
func TestGetOrder(t *testing.T) {
orderID := "3025427524410871880"
order, err := new(PurchaseHandler).GetOrder(orderID)
order, err := new(PurchaseHandler).GetOrder("", orderID)
if err != nil {
t.Fatal(err.Error())
}