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:
邹宗楠
2025-08-14 16:31:08 +08:00
parent 37502b82b8
commit f1cf4b5cf4
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -484,33 +484,40 @@ func (p *PurchaseHandler) trySyncCancelStatus(vendorOrderID string) (err error)
// 将订单从购物平台配送转为自送后又送达 // 将订单从购物平台配送转为自送后又送达
func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
// todo 饿百转商家自送后，没有确认送达的概念，空操作 param2 := &ebaiapi.PushRiderInfo{
if globals.EnableEbaiStoreWrite && order.WaybillVendorID > 100 { DistributorId: 201,
param2 := &ebaiapi.PushRiderInfo{ OrderId: order.VendorOrderID,
DistributorId: 201, State: 21,
OrderId: order.VendorOrderID, SelfStatus: ebaiapi.OrderDeliveryStatusSendOver,
State: 21, SelfStatusDesc: "自配送送达",
SelfStatus: ebaiapi.OrderDeliveryStatusSendOver, DistributorInfoDTO: ebaiapi.DistributorInfoDTO{
SelfStatusDesc: "自配送送达", DistributorTypeId: "99999",
DistributorInfoDTO: ebaiapi.DistributorInfoDTO{ DistributorName: "商家自行配送",
DistributorTypeId: "99999", },
DistributorName: "商家自行配送", }
}, bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil)
for _, v := range bills {
if v.Status == model.WaybillStatusDelivered || v.Status == model.WaybillStatusFailed {
param2.Knight = ebaiapi.Knight{
Id: utils.Str2Int64(order.VendorOrderID),
Name: v.CourierName,
Phone: v.CourierMobile,
}
break
} }
bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil) }
for _, v := range bills { if param2.Knight.Name == "" {
if v.Status == model.WaybillStatusDelivered || v.Status == model.WaybillStatusFailed { store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
param2.Knight = ebaiapi.Knight{ if store != nil {
Id: utils.Str2Int64(order.VendorOrderID), param2.Knight = ebaiapi.Knight{
Name: v.CourierName, Id: utils.Str2Int64(order.VendorOrderID),
Phone: v.CourierMobile, Name: store.Name,
} Phone: store.Tel1,
break
} }
} }
err = api.EbaiAPI.OrderselfDeliveryStateSync2(param2)
} }
err = api.EbaiAPI.OrderselfDeliveryStateSync2(param2)
return err return err
} }