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-09-26 09:38:51 +08:00
parent ab436c5180
commit 89b9906d2c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/partner/purchase/mtwm/order_afs.go
View File

@@ -160,6 +160,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
// 新订单平台自动同意退单,某一些情况下产生的运单没退!这个处理一下! // 新订单平台自动同意退单,某一些情况下产生的运单没退!这个处理一下!
//if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && (msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderAgree) { //if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && (msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderAgree) {
// partner.CurOrderManager.+
// defsch.FixedScheduler.CancelAll3rdWaybills(jxcontext.AdminCtx, orderStatus.RefVendorOrderID, orderStatus.VendorID, true) // defsch.FixedScheduler.CancelAll3rdWaybills(jxcontext.AdminCtx, orderStatus.RefVendorOrderID, orderStatus.VendorID, true)
//} //}
} }

8
business/partner/purchase/tiktok_store/order.go
View File

@@ -984,15 +984,17 @@ func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, re
} }
// OrderLogisticsStatus 获取订单配送状态 // OrderLogisticsStatus 获取订单配送状态
func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (*utils.RiderInfo, error) { func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (data *utils.RiderInfo, err error) {
orderInfo, err := dao.GetSimpleOrder(dao.GetDB(), orderId) orderInfo, err := dao.GetSimpleOrder(dao.GetDB(), orderId)
if err != nil { if err != nil {
return nil, errors.New("获取本地门店账号信息失败，请重试") data.LogisticsStatus = 0
return data, errors.New("获取本地门店账号信息失败，请重试")
} }
waybill, err := getAPI(orderInfo.VendorOrgCode, 0, "").GetShipmentInfo(utils.Str2Int64(orderInfo.VendorOrderID), 0, tiktokShop.ShipmentTypeInvoice) waybill, err := getAPI(orderInfo.VendorOrgCode, 0, "").GetShipmentInfo(utils.Str2Int64(orderInfo.VendorOrderID), 0, tiktokShop.ShipmentTypeInvoice)
if err != nil { if err != nil {
return nil, err data.LogisticsStatus = 0
return data, err
} }
result := &utils.RiderInfo{ result := &utils.RiderInfo{