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:
邹宗楠
2023-12-27 18:33:05 +08:00
parent e2f2d522f6
commit cc22a42237
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
business/partner/purchase/ebai/order.go
View File

@@ -391,6 +391,9 @@ func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *mod
// 将订单从购物平台配送转为自送 // 将订单从购物平台配送转为自送
func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
if strings.Contains(order.ConsigneeAddress, "隐私保护") {
return fmt.Errorf("用户地址隐私保护中,商家无法转自配送")
}
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
deliveryStatusObj, _ := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID) deliveryStatusObj, _ := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID)
deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatusObj["status"])) deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatusObj["status"]))
@@ -404,29 +407,13 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
case ebaiapi.WaybillStatusCourierAccepted: case ebaiapi.WaybillStatusCourierAccepted:
err = errors.New("骑手已接单,无法转自送") err = errors.New("骑手已接单,无法转自送")
} }
//if order.DeliveryType == model.OrderDeliveryTypePlatform {
// if err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID); err != nil {
// if strings.Contains(err.Error(), "301251") {
// api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手
// }
// if utils.IsErrMatch(err, "301251", nil) {
// if deliveryStatus, err2 := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err2 == nil {
// deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatus["status"]))
// if deliveryStatus == ebaiapi.WaybillStatusSelfDelivery {
// err = nil
// } else if deliveryStatus == ebaiapi.WaybillStatusDeliveryCancled {
// p.trySyncCancelStatus(order.VendorOrderID)
// }
// }
// }
// }
//}
} }
if err == nil { if err == nil {
// 饿百不会发送配送中，模拟发送 // 饿百不会发送配送中，模拟发送
p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusCourierAccepted) p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusCourierAccepted)
} }
return err return err
} }