diff --git a/platformapi/dadaapi/order.go b/platformapi/dadaapi/order.go index 4ef53294..62acbb30 100644 --- a/platformapi/dadaapi/order.go +++ b/platformapi/dadaapi/order.go @@ -23,11 +23,10 @@ const ( OrderStatusDelivering = 3 // 配送中 OrderStatusFinished = 4 // 已完成 OrderStatusCanceled = 5 // 已取消 - OrderStatusExpired = 7 // OrderStatusAssignment = 8 // 指派单 OrderStatusReturning = 9 // 妥投异常之物品返回中 OrderStatusReturningFinished = 10 // 妥投异常之物品返回完成 - OrderStatusReturningInOrder = 100 // 妥投异常之物品返回完成 + OrderStatusReturningInOrder = 100 // 骑手到店 OrderStatusAddOrderFailed = 1000 // ,创建达达运单失败 ) diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go index 6c09ab98..0c427157 100644 --- a/platformapi/mtpsapi/mtpsapi.go +++ b/platformapi/mtpsapi/mtpsapi.go @@ -18,11 +18,12 @@ const ( ) const ( - OrderStatusWaitingForSchedule = 0 // 0：待调度 - OrderStatusAccepted = 20 // 20：已接单 - OrderStatusPickedUp = 30 // 30：已取货 - OrderStatusDeliverred = 50 // 50：已送达 - OrderStatusCanceled = 99 // 99：已取消 + OrderStatusWaitingForSchedule = 0 // 0：待调度 + OrderStatusAccepted = 20 // 20：已接单 + OrderStatusPickedUp = 30 // 30：已取货 + OrderStatusDeliverred = 50 // 50：已送达 + OrderStatusCanceled = 99 // 99：已取消 + OrderStatusFakeToStore = 200 // 自定义假的到店 ) const ( diff --git a/platformapi/mtpsapi/riderInfo.go b/platformapi/mtpsapi/riderInfo.go index 8b21ca16..d493764c 100644 --- a/platformapi/mtpsapi/riderInfo.go +++ b/platformapi/mtpsapi/riderInfo.go @@ -13,7 +13,7 @@ type RiderInfo struct { CourierName string `json:"courier_name"` // 骑手名称 CourierPhone string `json:"courier_phone"` // 骑手电话 LogisticsProviderCode string `json:"logistics_provider_code"` // 配送平台code 10001-顺丰, 10002-达达, 10003-闪送, 10004-蜂鸟, 10005 UU跑腿,10006 快跑者, 10007 极客快送,10008-点我达,10009 同达, 10010-生活半径,10011 邻趣,10012 趣送, 10013 快服务 10014 菜鸟新配盟 10015 商家自建配送 10016 风先生,10017-其他,10032-美团跑腿 - LogisticsStatus int `json:"logistics_status"` // 配送状态 + LogisticsStatus int `json:"logistics_status"` // 配送状态(美团用) LogisticsContext string `json:"logistics_context"` // 配送状态描述 Latitude string `json:"latitude"` // 骑手当前的纬度，美团使用的是高德坐标系。 Longitude string `json:"longitude"` // 骑手当前的经度，美团使用的是高德坐标系。 diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index da6b2735..8963d192 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -17,7 +17,7 @@ func TestAfsOrder(t *testing.T) { // 同意/拒绝售后单 func TestAggreOrNotAggreAfs(t *testing.T) { - a.AfterSaleOperate(int32(201), "4994452108005135590", "1", 0) + a.AfterSaleOperate(int32(202), "7161251923629179177", "1", 0) fmt.Println("11", 8|16|32|1) } diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index 719c7c91..da4581f6 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -145,7 +145,8 @@ func (a *API) AfterSaleOperate(refundType int32, refundId, remark string, storeI paramList.RejectReasonCode = reasonItem[0].RejectReasonCode paramList.Reason = reasonItem[0].Reason paramList.Remark = remark - // 111同意退货（二次审核） 121退货转退款 201同意仅退款 203同意拒签后退款 321换货转退款 401同意售前退申请 501同意补寄 502 拒绝补寄 + refundListParam = append(refundListParam, paramList) + // 111同意退货（二次审核） 121退货转退款 201同意仅退款 203同意拒签后退款 321换货转退款 401同意售前退申请 501同意补寄 502 拒绝补寄 case AfterSaleEmuAgreeToReturnTwoApply, AfterSaleEmuReturnGoodsToRefundApply, AfterSaleEmuAgreeOnlyRefundApply, AfterSaleEmuRefundAfterRefusalApply, AfterSaleEmuChangeGoodsToRefundApply, AfterSaleEmuAgreePreSaleReturnApply, AfterSaleEmuAgreeReissueApply, AfterSaleEmuRefundReissueApply: var paramList = afterSale_operate_request.ItemsItem{} paramList.AftersaleId = refundId @@ -604,6 +605,12 @@ func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, *Callb return "", CallbackResponseErr(false) } return create.PId, Err2CallbackResponse(nil, "") + case CallbackRefundClosedMsgTagId: // 当买家取消申请或系统超时机制导致退款取消时，会推送此消息 + create := UserCancelRefundOrderData{} + if err := utils.Map2StructByJson(data, &create, false); err != nil { + return "", CallbackResponseErr(false) + } + return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") default: return "", CallbackResponseErr(false) } diff --git a/platformapi/tiktok_shop/tiktok_api/order_type.go b/platformapi/tiktok_shop/tiktok_api/order_type.go index 440530be..20c7e2af 100644 --- a/platformapi/tiktok_shop/tiktok_api/order_type.go +++ b/platformapi/tiktok_shop/tiktok_api/order_type.go @@ -316,6 +316,30 @@ type AppointmentChangeData struct { //#endregion +//#region 当买家取消申请或系统超时机制导致退款取消时，会推送此消息 + +type UserCancelRefundOrderCallback struct { + PublicOrderCallback + Data *UserCancelRefundOrderData `json:"data"` +} + +type UserCancelRefundOrderData struct { + AftersaleId int64 `json:"aftersale_id"` // 售后单ID + AftersaleStatus int `json:"aftersale_status"` // 售后状态：6-售后申请；27-拒绝售后申请；12-售后成功；7-售后退货中；11-售后已发货；29-售后退货拒绝；13-【换货返回：换货售后换货商家发货】，【补寄返回：补寄待用户收货】； 14-【换货返回：（换货）售后换货用户收货】，【补寄返回：（补寄）用户已收货】 ；28-售后失败；51-订单取消成功；53-逆向交易已完成； + AftersaleType int `json:"aftersale_type"` // 售后类型： 0: 退货 1: 售后仅退款 2: 发货前整单退款 + CloseTime int `json:"close_time"` // 退款成功时间 + PId int64 `json:"p_id"` // 父订单ID + ReasonCode int `json:"reason_code"` // 原因码 + RefundAmount int `json:"refund_amount"` // 申请退款的金额（含运费） + RefundPostAmount int `json:"refund_post_amount"` // 申请退的运费金额 + RefundVoucherNum int `json:"refund_voucher_num"` // 申请退款的卡券的数量 + SId int64 `json:"s_id"` // 子订单ID + ShopId int `json:"shop_id"` // 店铺ID + UpdateTime time.Time `json:"update_time"` // 售后单更新时间 +} + +//#endregion + //#region 假的拣货完成 type FakePickUpGoodsCallback struct { PublicOrderCallback diff --git a/platformapi/tiktok_shop/tiktok_api/order_type_const.go b/platformapi/tiktok_shop/tiktok_api/order_type_const.go index f8bf1b04..6181a2d8 100644 --- a/platformapi/tiktok_shop/tiktok_api/order_type_const.go +++ b/platformapi/tiktok_shop/tiktok_api/order_type_const.go @@ -115,7 +115,7 @@ const ( CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息 CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息 CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息 - CallbackRefundClosedMsgTagId = "207" // 售后关闭消息 + CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息 CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息 CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息 CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息