diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 3e6927bb9..b3c3c32e6 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -531,7 +531,6 @@ func vendorStatusToLocalStatus(vendorStatus int64) int { } func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, VendorStatus, appOrgCode string) { - // c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup) msg := &tiktokShop.FakePickUpGoodsData{ PId: vendorOrderID, VendorStatus: VendorStatus, diff --git a/business/partner/purchase/tiktok_store/waybill.go b/business/partner/purchase/tiktok_store/waybill.go index a289e5b3a..4ff7006fa 100644 --- a/business/partner/purchase/tiktok_store/waybill.go +++ b/business/partner/purchase/tiktok_store/waybill.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" instantShopping_getDeliveryListByOrderId_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/instantShopping_getDeliveryListByOrderId/response" + "time" superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response" superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request" @@ -38,14 +39,26 @@ func (p *PurchaseHandler) GetWaybillStatusFromVendorStatus(vendorStatus string) func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *tiktok_api.CallbackResponse { waybill := c.callbackMsg2Waybill(tag, orderId, data) - if localOrder, _, err := dao.GetOrders(dao.GetDB(), nil, false, false, "", "", false, []int{0}, false, "", - map[string]interface{}{ - "vendorOrderID": waybill.VendorOrderID, - }, 0, 0); err == nil { - + if localOrder, err := partner.CurOrderManager.LoadOrder(waybill.VendorOrderID, model.VendorIDDD); err == nil { err := partner.CurOrderManager.OnWaybillStatusChanged(waybill) - if err == nil && waybill.Status == model.WaybillStatusDelivering { - c.postFakeMsg(waybill.VendorOrderID, FakeMsgType, utils.Int2Str(tiktok_api.ShipmentStatusDelivering), localOrder[0].VendorStoreID) + if err == nil { + status := &model.OrderStatus{ + VendorOrderID: waybill.VendorOrderID, + VendorID: model.VendorIDDD, + OrderType: model.OrderTypeWaybill, + RefVendorOrderID: waybill.VendorOrderID, + RefVendorID: model.VendorIDDD, + Status: waybill.Status, + VendorStatus: waybill.VendorStatus, + StatusTime: time.Now(), + DuplicatedCount: 0, + Remark: "", + ModelTimeInfo: model.ModelTimeInfo{ + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + }, + } + err = partner.CurOrderManager.OnOrderStatusChanged(localOrder.VendorOrgCode, status) } return tiktok_api.Err2CallbackResponse(err, "") }