diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index 6f52c1a50..783a72385 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -213,6 +213,9 @@ func (c *OrderManager) addAfsOrderStatus(db *dao.DaoDB, orderStatus *model.Order } if orderStatus.VendorID == model.VendorIDDD { order.Flag = 0 + if strings.Contains(orderStatus.VendorStatus, "cancel_refund_afsOrder") { + order.Flag = 3 + } updateFields = append(updateFields, "Flag") } if model.IsAfsOrderFinalStatus(orderStatus.Status) { diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 0bf849fd7..e6f48308c 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -11,7 +11,6 @@ import ( func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { if CurPurchaseHandler != nil { orderId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) - jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index b5d417e47..5baf4fce4 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -49,7 +49,6 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) { var err error orderStatus, vendorOrgCode := c.callbackAfsMsg2Status(msgId, msg) - globals.SugarLogger.Debugf("========onAfsOrderMsg====== : %s", utils.Format4Output(orderStatus, false)) if orderStatus == nil { return tiktokShop.Err2CallbackResponse(nil, "") } @@ -72,7 +71,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * return tiktokShop.Err2CallbackResponse(err, "") } - if msgId == tiktokShop.CallbackRefundOrderMsgTagId { // 不存在的新订单 + if msgId == tiktokShop.CallbackRefundOrderMsgTagId || msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { // 不存在的新订单 afsOrder = &model.AfsOrder{ VendorID: model.VendorIDDD, AfsOrderID: orderStatus.VendorOrderID, @@ -98,7 +97,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * afsOrder.VendorStatus = orderStatus.VendorStatus // 退货状态 for _, sku := range tiktokAfsOrderDetail.Data.OrderInfo.SkuOrderInfos { orderSku := &model.OrderSkuFinancial{ - Count: int(sku.ItemQuantity), + Count: int(sku.AfterSaleItemCount), VendorSkuID: utils.Int64ToStr(sku.SkuOrderId), SkuID: utils.Str2Int(sku.ShopSkuCode), Name: sku.ProductName, @@ -116,6 +115,13 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * if orderStatus.Status == model.AfsOrderStatusFinished { afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt } + if msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { + _, err = dao.DeleteEntity(dao.GetDB(), afsOrder, "VendorOrderID", "VendorID") + globals.SugarLogger.Debugf("err1============== %s", err.Error()) + afsOrder.Skus[0].VendorOrderID = afsOrder.VendorOrderID + _, err = dao.DeleteEntity(dao.GetDB(), afsOrder.Skus[0], "VendorOrderID") + globals.SugarLogger.Debugf("err2============== %s", err.Error()) + } err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } } else { diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 213c1bcc2..2a1eecdcb 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -3,7 +3,6 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "strings" @@ -28,7 +27,6 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { return } - globals.SugarLogger.Debugf("=========================CallbackTiktokOrderMsg======== %s", string(byteList)) // 2.参数解析 orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) if resp.Code != 0 {