diff --git a/platformapi/ebaiapi/callback.go b/platformapi/ebaiapi/callback.go index 1a337ddb..6101b1ca 100644 --- a/platformapi/ebaiapi/callback.go +++ b/platformapi/ebaiapi/callback.go @@ -10,6 +10,18 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +const ( + CmdOrderCreate = "order.create" + CmdOrderDeliveryStatus = "order.deliveryStatus.push" + CmdOrderPartRefund = "order.partrefund.push" // 售前只能是商户发起 售后是用户, 你看是由谁发起的就可以知道,来自惠焕 + CmdOrderStatus = "order.status.push" + CmdOrderUserCancel = "order.user.cancel" + + CmdShopMsgPush = "shop.msg.push" + CmdShopBindMsg = "shop.bind.msg" + CmdShopUnbindMsg = "shop.unbind.msg" +) + type CallbackResponse struct { Cmd string `json:"cmd"` Sign string `json:"sign"` diff --git a/platformapi/ebaiapi/ebaiapi.go b/platformapi/ebaiapi/ebaiapi.go index 4373d214..65f9249f 100644 --- a/platformapi/ebaiapi/ebaiapi.go +++ b/platformapi/ebaiapi/ebaiapi.go @@ -26,18 +26,6 @@ const ( ResponseCodeCallElmFailed = 2101 // 这个可以尝试重试 ) -const ( - CmdOrderCreate = "order.create" - CmdOrderDeliveryStatus = "order.deliveryStatus.push" - CmdOrderPartRefund = "order.partrefund.push" - CmdOrderStatus = "order.status.push" - CmdOrderUserCancel = "order.user.cancel" - - CmdShopMsgPush = "shop.msg.push" - CmdShopBindMsg = "shop.bind.msg" - CmdShopUnbindMsg = "shop.unbind.msg" -) - type ResponseResult struct { ErrNo int `json:"errno"` Error string `json:"error"` diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index f778d182..8fbd66cf 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -44,13 +44,30 @@ const ( ) const ( - OrderPartRefundSuccess = "20" // 部分取消订单退款成功状态20 - AfterOrderFinishedCancelType = "2" // 订单完成后全单退款 + // 订单下行 - order.partrefund.push-部分退款订单信息推送 + OrderPartRefuncTypeMerchant = "1" // 表示商户发起的部分退款 + OrderPartRefuncTypeCustomer = "2" // 表示用户发起的部分退款 + OrderPartRefuncTypeCS = "3" // 表示客服直接发起的部分退款 - OrderUserApplyCancel = "10" // 发起申请 - OrderUserCancelSuccessA = "40" // 全单取消订单退款成功状态40 客服同意 - OrderUserCancelSuccessB = "60" // 全单取消订单退款成功状态60 商家同意 - SendImmediatelySelf = 6 // 饿百商家自送的配送状态 + OrderPartRefundApply = "10" // 表示商家/用户发起部分退款申请 + OrderPartRefundSuccess = "20" // 表示部分退款成功 + OrderPartRefundUserApplyArbitration = "30" // 用户申请仲裁,客服介入 + OrderPartRefundFailed = "40" // 表示部分退款失败 + OrderPartRefundMerchantRefused = "50" // 表示商家拒绝用户发起的部分退款申请 + + // 订单下行 - order.user.cancel-用户申请订单取消/退款 + OrderUserCancelApply = "10" // 发起申请 + OrderUserCancelCSIntervene = "20" // 客服介入 + OrderUserCancelCSRefused = "30" // 客服拒绝 + OrderUserCancelCSAgreed = "40" // 客服同意 + OrderUserCancelMerchantRefused = "50" // 商户拒绝 + OrderUserCancelMerchantAgreed = "60" // 商家同意 + OrderUserCancelInvalid = "70" // 申请失效 + + OrderUserCancelTypeBeforeSale = "1" // 表示订单完成前用户全单取消申请流程 + OrderUserCancelTypeAfterSale = "2" // 表示订单完成后用户全单退款申请流程 + + SendImmediatelySelf = 6 // 饿百商家自送的配送状态 ) const ( @@ -58,6 +75,10 @@ const ( OrderFromElm = "2" ) +const ( + UserApplyCancelWaitMinute = 15 // 用户申请取消订单后待处理的最大等待时间(分钟),超时自动同意 +) + type ExpressInfo struct { OrderID string `json:"order_id"` ExpressID string `json:"express_id"` diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go index 7317476c..86f3c2d3 100644 --- a/platformapi/jdapi/order.go +++ b/platformapi/jdapi/order.go @@ -63,6 +63,10 @@ const ( SelfDeliveryCarrierNo = "2938" // 京东配送方式=商家自送 ) +const ( + UserApplyCancelWaitMinute = 15 // 用户申请取消订单后待处理的最大等待时间(分钟),超时自动同意 +) + const ( QueryOrderRetryCount = 1 // 因为京东到家当前不存在的订单也返回-4,暂时不重试 ) diff --git a/platformapi/mtwmapi/order.go b/platformapi/mtwmapi/order.go index 4d5e6dec..790fc024 100644 --- a/platformapi/mtwmapi/order.go +++ b/platformapi/mtwmapi/order.go @@ -46,6 +46,10 @@ const ( NotifyTypeSuccess = "agree" ) +const ( + UserApplyCancelWaitMinute = 30 // 用户申请退款后,商家未在30分钟内(大连锁商家为3小时内)处理退款请求,系统将自动同意退款 +) + type RefundSku struct { AppFoodCode string `json:"app_food_code"` SkuID string `json:"sku_id,omitempty"`