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-10-24 11:29:25 +08:00
parent 9b8b41326c
commit 4dd2456941
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,7 +531,6 @@ func vendorStatusToLocalStatus(vendorStatus int64) int {
} }
func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, VendorStatus, appOrgCode string) { func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, VendorStatus, appOrgCode string) {
// c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
msg := &tiktokShop.FakePickUpGoodsData{ msg := &tiktokShop.FakePickUpGoodsData{
PId: vendorOrderID, PId: vendorOrderID,
VendorStatus: VendorStatus, VendorStatus: VendorStatus,

27
business/partner/purchase/tiktok_store/waybill.go
View File

@@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
instantShopping_getDeliveryListByOrderId_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/instantShopping_getDeliveryListByOrderId/response" 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_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" 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 { func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *tiktok_api.CallbackResponse {
waybill := c.callbackMsg2Waybill(tag, orderId, data) waybill := c.callbackMsg2Waybill(tag, orderId, data)
if localOrder, _, err := dao.GetOrders(dao.GetDB(), nil, false, false, "", "", false, []int{0}, false, "", if localOrder, err := partner.CurOrderManager.LoadOrder(waybill.VendorOrderID, model.VendorIDDD); err == nil {
map[string]interface{}{
"vendorOrderID": waybill.VendorOrderID,
}, 0, 0); err == nil {
err := partner.CurOrderManager.OnWaybillStatusChanged(waybill) err := partner.CurOrderManager.OnWaybillStatusChanged(waybill)
if err == nil && waybill.Status == model.WaybillStatusDelivering { if err == nil {
c.postFakeMsg(waybill.VendorOrderID, FakeMsgType, utils.Int2Str(tiktok_api.ShipmentStatusDelivering), localOrder[0].VendorStoreID) 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, "") return tiktok_api.Err2CallbackResponse(err, "")
} }