diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 67cf454ea..b81717abb 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1639,7 +1639,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) } order.Status = model.OrderStatusNew if order.ActualPayPrice == 0 { - msg, err := jdshop.GetJdsOrder(order.VendorOrderID2) + msg, err := jdshop.GetJdsOrder(order.VendorOrderID2, order.VendorOrgCode) if err == nil { if jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment)) == 0 { order.ActualPayPrice = jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderTotalPrice) + utils.Str2Float64(msg.FreightPrice) - utils.Str2Float64(msg.SellerDiscount)) @@ -1886,7 +1886,7 @@ func RefreshJdsOrderConsigneeInfo(ctx *jxcontext.Context, vendorOrderID string) if waybill != nil { return fmt.Errorf("已经创建了三方运单不允许修改联系人信息!") } - jdsOrder, err := jdshop.GetJdsOrder(order.VendorOrderID2) + jdsOrder, err := jdshop.GetJdsOrder(order.VendorOrderID2, order.VendorOrgCode) if err != nil { return err } diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 26c79f624..7eaa8c4e3 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -48,7 +48,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order * return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err } func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) { - jdsOrder, err := GetJdsOrder(vendorOrderID) + jdsOrder, err := GetJdsOrder(vendorOrderID, vendorOrgCode) return status2Jxstatus(jdsOrder.OrderState), err } @@ -243,10 +243,11 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter return retVal, err } -func GetJdsOrder(vendorOrderID string) (jdsOrder *jdshopapi.GetOrderResult, err error) { +func GetJdsOrder(vendorOrderID, vendorOrgCode string) (jdsOrder *jdshopapi.GetOrderResult, err error) { params := make(map[string]interface{}) params["orderID"] = vendorOrderID params["token"] = jdshopapi.JdsYdToken + params["vendorOrgCode"] = vendorOrgCode result, err := apiToYd("order/GetJdsOrder", params) jdsOrder2 := &jdshopapi.GetOrderResult{} err = utils.UnmarshalUseNumber([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder2)