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

1

Browse Source
This commit is contained in:
邹宗楠
2022-05-17 19:22:03 +08:00
parent f12103db54
commit 4dff237ce4
5 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/partner/delivery/rider.go
View File

@@ -59,8 +59,11 @@ func GetOrderRiderInfoToPlatform(orderId string) {
if v.WaybillVendorID == model.VendorIDDada || v.WaybillVendorID == model.VendorIDFengNiao {
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, "")
} else {
globals.SugarLogger.Debug("==========VendorWaybillId2Waybill:", v.VendorWaybillId2Waybill)
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, utils.Str2Int64(v.VendorWaybillId2Waybill), v.VendorWaybillID)
globals.SugarLogger.Debug("==========VendorWaybillId2Waybill:", v.VendorWaybillID)
if v.VendorWaybillId2Waybill == "" {
continue
}
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, utils.Str2Int64(v.VendorWaybillID), v.VendorWaybillID)
}
if err != nil {
globals.SugarLogger.Debug("Get Order waybill rider info err :%v", err)
@@ -80,6 +83,7 @@ func GetOrderRiderInfoToPlatform(orderId string) {
if v.WaybillVendorID == model.VendorIDMTPS {
riderInfo.LogisticsProviderCode = "10032"
}
riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
// 目前只推送美团骑手信息
switch v.VendorID {

3
business/partner/purchase/jdshop/order.go
View File

@@ -28,10 +28,8 @@ func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, o
func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
result := &jdshopapi.AllOrdersResult{}
if err := utils.Map2StructByJson(orderData, &result, false); err != nil {
fmt.Println("err===============", err)
return nil
}
fmt.Println("err===============", orderData)
jdsOrder := result.OrderList[0]
order = &model.GoodsOrder{
@@ -56,7 +54,6 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
if err != nil {
return nil, err
}
fmt.Println("resultOrders===============", resultOrders)
return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
}
func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {