From 767d59d850aac8ef6bec605f468ca5ba2f221a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 18:26:58 +0800 Subject: [PATCH 1/9] 1 --- controllers/tiktok_order.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 213c1bcc2..ca3b98239 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -2,6 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "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" @@ -31,6 +32,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { globals.SugarLogger.Debugf("=========================CallbackTiktokOrderMsg======== %s", string(byteList)) // 2.参数解析 orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) + globals.SugarLogger.Debugf("=========================orderStatus======== %s", utils.Format4Output(orderStatus, false)) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() From 5cf243189c84972962d089112adb5b45a22de4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 18:29:57 +0800 Subject: [PATCH 2/9] 1 --- business/partner/purchase/tiktok_store/callback.go | 1 - business/partner/purchase/tiktok_store/order.go | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) 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.go b/business/partner/purchase/tiktok_store/order.go index 53f7a36c8..2d3e64916 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -255,6 +255,7 @@ func getSkuWeight(product map[string]interface{}) (weight int) { } func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (response *tiktokShop.CallbackResponse) { + globals.SugarLogger.Debugf("=========================Msg := %s", utils.Format4Output(msg, false)) var err error // 处理售后单 if c.isAfsMsg(msgId) { From 395a4310a0a5398c44736f57d8b80801e3018c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 19:05:20 +0800 Subject: [PATCH 3/9] 1 --- business/jxcallback/orderman/order_afs.go | 3 +++ business/partner/purchase/tiktok_store/order.go | 1 - business/partner/purchase/tiktok_store/order_afs.go | 2 +- business/partner/purchase/tiktok_store/order_afs_utils.go | 2 -- controllers/tiktok_order.go | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) 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/order.go b/business/partner/purchase/tiktok_store/order.go index 2d3e64916..53f7a36c8 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -255,7 +255,6 @@ func getSkuWeight(product map[string]interface{}) (weight int) { } func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (response *tiktokShop.CallbackResponse) { - globals.SugarLogger.Debugf("=========================Msg := %s", utils.Format4Output(msg, false)) var err error // 处理售后单 if c.isAfsMsg(msgId) { diff --git a/business/partner/purchase/tiktok_store/order_afs.go b/business/partner/purchase/tiktok_store/order_afs.go index 1a050b11a..e239b2ad2 100644 --- a/business/partner/purchase/tiktok_store/order_afs.go +++ b/business/partner/purchase/tiktok_store/order_afs.go @@ -20,7 +20,7 @@ var ( tiktokShop.CallbackRefundShopMsgTagId: model.AfsOrderStatusFailed, // 拒绝退货 tiktokShop.CallbackReturnApplyAgreedMsgTagId: model.AfsOrderStatusFinished, // 同意退货 tiktokShop.CallbackReturnRefundAgreedMsgTagId: model.AfsOrderStatusFinished, // 同意退款 - tiktokShop.CallbackRefundClosedMsgTagId: model.AfsOrderStatusFailed, // 驳回 + tiktokShop.CallbackRefundClosedMsgTagId: model.AfsOrderStatusFinished, // 驳回 } AfsTagIDMap = map[string]string{ diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index b5d417e47..2e0dc0b6a 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" - "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -49,7 +48,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, "") } diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index ca3b98239..2a1eecdcb 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -2,9 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" - "git.rosy.net.cn/baseapi/utils" "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" @@ -29,10 +27,8 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { return } - globals.SugarLogger.Debugf("=========================CallbackTiktokOrderMsg======== %s", string(byteList)) // 2.参数解析 orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) - globals.SugarLogger.Debugf("=========================orderStatus======== %s", utils.Format4Output(orderStatus, false)) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() From 84eb8679902b81cc80403f2ba9fd039a92b3f870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 20:15:35 +0800 Subject: [PATCH 4/9] 1 --- business/partner/purchase/tiktok_store/order_afs.go | 2 +- business/partner/purchase/tiktok_store/order_afs_utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order_afs.go b/business/partner/purchase/tiktok_store/order_afs.go index e239b2ad2..1a050b11a 100644 --- a/business/partner/purchase/tiktok_store/order_afs.go +++ b/business/partner/purchase/tiktok_store/order_afs.go @@ -20,7 +20,7 @@ var ( tiktokShop.CallbackRefundShopMsgTagId: model.AfsOrderStatusFailed, // 拒绝退货 tiktokShop.CallbackReturnApplyAgreedMsgTagId: model.AfsOrderStatusFinished, // 同意退货 tiktokShop.CallbackReturnRefundAgreedMsgTagId: model.AfsOrderStatusFinished, // 同意退款 - tiktokShop.CallbackRefundClosedMsgTagId: model.AfsOrderStatusFinished, // 驳回 + tiktokShop.CallbackRefundClosedMsgTagId: model.AfsOrderStatusFailed, // 驳回 } AfsTagIDMap = map[string]string{ diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index 2e0dc0b6a..1592acb6c 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -96,7 +96,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, From de11080c9396184236edfa12d96d5035e6cd2b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 20:32:52 +0800 Subject: [PATCH 5/9] 1 --- business/partner/purchase/tiktok_store/order_afs_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index 1592acb6c..d3fcb495e 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -70,7 +70,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, From fba5a4d967e3554cec508a92ec20ef286a130c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Nov 2022 09:13:42 +0800 Subject: [PATCH 6/9] 1 --- .../purchase/tiktok_store/order_afs_utils.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index d3fcb495e..25d372f75 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -114,6 +115,20 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * if orderStatus.Status == model.AfsOrderStatusFinished { afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt } + if msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { + err = utils.CallFuncLogError(func() error { + if _, err = dao.DeleteEntity(dao.GetDB(), afsOrder, "VendorOrderID", "VendorID"); err != nil { + _, err = dao.DeleteEntity(dao.GetDB(), afsOrder.Skus[0], "VendorOrderID") + if err != nil { + globals.SugarLogger.Debugf("卖家修改售后单异常删除商品列表异常 := %s", err.Error()) + } + } + return err + }, "SaveAfsOrder delete AfsOrder, afsOrderID:%s", afsOrder.AfsOrderID) + if err != nil { + globals.SugarLogger.Debugf("卖家修改售后单异常,删除售后单异常 := %s", err.Error()) + } + } err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } } else { From e95fc34249e633b17ff86a660b42f30e48364274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Nov 2022 09:38:00 +0800 Subject: [PATCH 7/9] 1 --- business/partner/purchase/tiktok_store/order_afs_utils.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index 25d372f75..6934f2184 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -47,6 +47,7 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) // todo 对于退款与部分退款，order.go与这个文件中对于状态的处理不一致 func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) { + globals.SugarLogger.Debugf("==========msg := %s", msg) var err error orderStatus, vendorOrgCode := c.callbackAfsMsg2Status(msgId, msg) if orderStatus == nil { @@ -118,7 +119,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * if msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { err = utils.CallFuncLogError(func() error { if _, err = dao.DeleteEntity(dao.GetDB(), afsOrder, "VendorOrderID", "VendorID"); err != nil { - _, err = dao.DeleteEntity(dao.GetDB(), afsOrder.Skus[0], "VendorOrderID") + _, err = dao.ExecuteSQL(dao.GetDB(), `DELETE FROM order_sku_financial WHERE vendor_order_id = ?`, []interface{}{afsOrder.VendorOrderID}) if err != nil { globals.SugarLogger.Debugf("卖家修改售后单异常删除商品列表异常 := %s", err.Error()) } From 5388fea2b04782ccf57f9720d7011b2c5d2bad7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Nov 2022 09:51:26 +0800 Subject: [PATCH 8/9] 1 --- .../partner/purchase/tiktok_store/order_afs_utils.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index 6934f2184..bce82cd8b 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -47,7 +47,6 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) // todo 对于退款与部分退款，order.go与这个文件中对于状态的处理不一致 func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) { - globals.SugarLogger.Debugf("==========msg := %s", msg) var err error orderStatus, vendorOrgCode := c.callbackAfsMsg2Status(msgId, msg) if orderStatus == nil { @@ -118,12 +117,11 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * } if msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { err = utils.CallFuncLogError(func() error { - if _, err = dao.DeleteEntity(dao.GetDB(), afsOrder, "VendorOrderID", "VendorID"); err != nil { - _, err = dao.ExecuteSQL(dao.GetDB(), `DELETE FROM order_sku_financial WHERE vendor_order_id = ?`, []interface{}{afsOrder.VendorOrderID}) - if err != nil { - globals.SugarLogger.Debugf("卖家修改售后单异常删除商品列表异常 := %s", err.Error()) - } - } + _, 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()) return err }, "SaveAfsOrder delete AfsOrder, afsOrderID:%s", afsOrder.AfsOrderID) if err != nil { From 8572d19a07bbde2825f676386b1ef53277e3ac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Nov 2022 10:07:41 +0800 Subject: [PATCH 9/9] 1 --- .../purchase/tiktok_store/order_afs_utils.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index bce82cd8b..5baf4fce4 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -116,17 +116,11 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt } if msgId == tiktokShop.CallbackUpdateRefundOrderMsgTagId { - err = utils.CallFuncLogError(func() error { - _, 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()) - return err - }, "SaveAfsOrder delete AfsOrder, afsOrderID:%s", afsOrder.AfsOrderID) - if err != nil { - globals.SugarLogger.Debugf("卖家修改售后单异常,删除售后单异常 := %s", err.Error()) - } + _, 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) }