diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 02abf56e5..17cb1ee69 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -190,10 +190,11 @@ func OnWaybillMsg(tag, orderId string, data interface{}) (response *tiktok_api.C VendorOrderID: utils.Int64ToStr(req.ShopOrderID), VendorWaybillID: req.TrackNo, VendorWaybillID2: utils.Int64ToStr(req.AfterSaleID), - WaybillVendorID: model.VendorIDDD, + WaybillVendorID: model.VendorIDDYPS, + OrderVendorID: model.VendorIDDD, CourierName: req.RiderName, CourierMobile: req.RiderPhone, - VendorStatus: tiktok_api.ShipmentStatus[req.ShipmentStatus], + VendorStatus: utils.Int64ToStr(req.ShipmentStatus), StatusTime: utils.Str2Time(req.OccurredTime), Remark: "", } diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index f144d2477..9bf6d126a 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -4,6 +4,8 @@ import ( "encoding/json" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "net/http" @@ -36,9 +38,9 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes // return guoYuan //} //} - //jxutils.CallMsgHandler(func() { - response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) - //}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) + jxutils.CallMsgHandler(func() { + response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) + }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) } return response }