diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go index 91406cce..2b75cbbb 100644 --- a/platformapi/jdapi/callback.go +++ b/platformapi/jdapi/callback.go @@ -9,12 +9,68 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +// 如下的常量其实都是京东回调消息的 +const ( + OrderStatusAddComment = "12001" + OrderStatusModifyComment = "12006" + OrderStatusTipChanged = "12008" + + OrderStatusPurchased = "41000" // 也即待处理,JD的消息很怪,新订单消息发过来是32000,但如果不是自动接单的,去查却是41000?,接单后才变为32000 + OrderStatusNew = "32000" + OrderStatusAdjust = "33080" + OrderStatusWaitOutStore = "32001" + OrderStatusFinishedPickup = "2" + OrderStatusDelivering = "33040" + + OrderStatusDelivered = "33060" + OrderStatusFinished = "90000" + OrderStatusCanceled = "20020" + + OrderStatusUserApplyCancel = "20030" // 这个其实不是一个状态,是一个动作 + OrderStatusLocked = "20010" + OrderStatusUnlocked = "20050" + OrderStatusInfoChanged = "1" + + OrderStatusPayFinishedSettle = "330901" // 订单支付完成应结 + OrderStatusAdjustSettle = "330902" // 订单调整后应结 + OrderStatusSwitch2SelfSettle = "330903" // 订单众包配送转自送后应结 +) + const ( StatusIDAddStore = "12003" // 新增门店消息 StatusIDDelStore = "12004" // 删除门店消息 StatusIDUpdateStore = "12009" // 修改门店消息 ) +const ( + AfsServiceStateWaiting4Audit = "10" // 待审核 + AfsServiceStateWaiting4UserFeedback = "11" // 待用户反馈 + AfsServiceStateWaiting4CSFeedback = "12" // 待客服反馈 + AfsServiceStateWaiting4GetGoods = "20" // 待取件 + AfsServiceStateRefundProcessing = "30" // 退款处理中 + AfsServiceStateWaiting4MerchantReceiveGoods = "31" // 待商家收货审核 + AfsServiceStateRefundSuccess = "32" // 退款成功 + AfsServiceStateRefundFailed = "33" // 退款失败 + AfsServiceStateAuditRefused = "40" // 审核不通过-驳回 + AfsServiceStateUserCanceled = "50" // 客户取消 + AfsServiceStateMerchantFailedReceiveGoods = "60" // 商家收货审核不通过 + AfsServiceStateSolved = "70" // 已解决 + AfsServiceStateWaiting4DirectCompensate = "90" // 待直陪 + AfsServiceStateDirectCompensate = "91" // 直赔 + AfsServiceStateDirectCompensateSuccess = "92" // 直赔成功 + AfsServiceStateDirectCompensateFailed = "93" // 直赔失败 + + AfsServiceStateWaiting4ReturnGoods = "110" // 待退货 + AfsServiceStateGetGoodsSuccess = "111" // 取货成功 + AfsServiceStateGettingGoods = "1101" // 取货中 + AfsServiceStateGetGoods2Shop = "1111" // 退货成功-商品已送至门店 + AfsServiceStateGetGoodsConfirmed = "1112" // 退货成功-商家已确认收货 + + AfsServiceStateGetGoodsWaiting4Refund = "112" // 退货成功-待退款 + AfsServiceStateReturnGoodsFailed = "113" // 退货失败 + AfsServiceStateReturnGoodsSuccess = "114" // 退货成功 +) + type CallbackResponse struct { Code string `json:"code"` Msg string `json:"msg"` @@ -62,11 +118,6 @@ const ( OpenSourceBatchTask = 14 ) -const ( - SaleBillStatusRefundSuccess = "32" - SaleBillStatusSaleReturnSuccess = "114" -) - type CallbackStoreStockMsg struct { StationNo string `json:"stationNo"` SkuId int64 `json:"skuId"` diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go index 2681a47f..f77727c8 100644 --- a/platformapi/jdapi/order.go +++ b/platformapi/jdapi/order.go @@ -6,32 +6,6 @@ import ( "git.rosy.net.cn/baseapi/utils" ) -const ( - OrderStatusAddComment = "12001" - OrderStatusModifyComment = "12006" - OrderStatusTipChanged = "12008" - - OrderStatusPurchased = "41000" // 也即待处理,JD的消息很怪,新订单消息发过来是32000,但如果不是自动接单的,去查却是41000?,接单后才变为32000 - OrderStatusNew = "32000" - OrderStatusAdjust = "33080" - OrderStatusWaitOutStore = "32001" - OrderStatusFinishedPickup = "2" - OrderStatusDelivering = "33040" - - OrderStatusDelivered = "33060" - OrderStatusFinished = "90000" - OrderStatusCanceled = "20020" - - OrderStatusUserApplyCancel = "20030" // 这个其实不是一个状态,是一个动作 - OrderStatusLocked = "20010" - OrderStatusUnlocked = "20050" - OrderStatusInfoChanged = "1" - - OrderStatusPayFinishedSettle = "330901" // 订单支付完成应结 - OrderStatusAdjustSettle = "330902" // 订单调整后应结 - OrderStatusSwitch2SelfSettle = "330903" // 订单众包配送转自送后应结 -) - const ( DeliveryStatusWait4Grap = "10" DeliveryStatusAccepted = "20" @@ -77,28 +51,6 @@ const ( AfsApproveTypeRefused = 3 // 驳回 ) -const ( - AfsServiceStateWaiting4Audit = 10 // 待审核 - AfsServiceStateWaiting4GetGoods = 20 // 待取件 - AfsServiceStateRefundProcessing = 30 // 退款处理中 - AfsServiceStateWaiting4MerchantReceiveGoods = 31 // 待商家收货审核 - AfsServiceStateRefundSuccess = 32 // 退款成功 - AfsServiceStateRefundFailed = 33 // 退款失败 - AfsServiceStateAuditRefused = 40 // 审核不通过-驳回 - AfsServiceStateUserCanceled = 50 // 客户取消 - AfsServiceStateMerchantFailedReceiveGoods = 60 // 商家收货审核不通过 - AfsServiceStateSolved = 70 // 已解决 - AfsServiceStateDirectCompensate = 91 // 直赔 - AfsServiceStateDirectCompensateSuccess = 92 // 直赔成功 - AfsServiceStateDirectCompensateFailed = 93 // 直赔失败 - AfsServiceStateWaiting4Compensate = 90 // 待赔付 - AfsServiceStateWaiting4ReturnGoods = 110 // 待退货 - AfsServiceStateGetGoodsSuccess = 111 // 取货成功 - AfsServiceStateGetGoodsWaiting4Refund = 112 // 退货成功-待退款 - AfsServiceStateReturnGoodsFailed = 113 // 退货失败 - AfsServiceStateReturnGoodsSuccess = 114 // 退货成功 -) - type AfsSkuDiscount struct { DetailDiscountType int `json:"detailDiscountType"` DiscountType int `json:"discountType"`