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()