diff --git a/rpc/error.go b/rpc/error.go index 1892574..e18af9d 100644 --- a/rpc/error.go +++ b/rpc/error.go @@ -5,38 +5,40 @@ type Error uint const ( ErrorSystem Error = 11001 // 系统错误 - ErrorOrderRepeat Error = 11002 // 重复下单 - ErrorOrderFreightFee Error = 11003 // 运费错误 - ErrorOrderSubmit Error = 11004 // 下单失败 - ErrorOrderShipment Error = 11005 // 无法配送 - ErrorOrderSkuPrice Error = 11006 // 商品价格错误 - ErrorOrderAmount Error = 11007 // 订单金额错误 - ErrorOrderLadingBill Error = 11008 // 订单已提单 - ErrorOrderClose Error = 11009 // 订单已关闭 - ErrorOrderTimeOut Error = 11010 // 订单超时 - ErrorOrderError Error = 11011 // 订单错误 - ErrorOrderUnPay Error = 11012 // 订单未支付 - ErrorOrderInvalid Error = 11013 // 订单失效 - ErrorOrderSkuInvalid Error = 11014 // 订单商品错误 - ErrorAfterServiceTypeError Error = 11015 // 售后类型错误 + ErrorOrderRepeat Error = 11002 // 重复下单 + ErrorOrderFreightFee Error = 11003 // 运费错误 + ErrorOrderSubmit Error = 11004 // 下单失败 + ErrorOrderShipment Error = 11005 // 无法配送 + ErrorOrderSkuPrice Error = 11006 // 商品价格错误 + ErrorOrderAmount Error = 11007 // 订单金额错误 + ErrorOrderLadingBill Error = 11008 // 订单已提单 + ErrorOrderClose Error = 11009 // 订单已关闭 + ErrorOrderTimeOut Error = 11010 // 订单超时 + ErrorOrderError Error = 11011 // 订单错误 + ErrorOrderUnPay Error = 11012 // 订单未支付 + ErrorOrderInvalid Error = 11013 // 订单失效 + ErrorOrderSkuInvalid Error = 11014 // 订单商品错误 + ErrorAfterServiceTypeError Error = 11015 // 售后类型错误 + ErrorAfterServiceReasonError Error = 11016 // 售后原因错误 ) var ErrorCodes = map[Error]string{ - ErrorSystem: "系统错误", - ErrorOrderRepeat: "重复下单", - ErrorOrderFreightFee: "运费错误", - ErrorOrderSubmit: "下单失败", - ErrorOrderShipment: "无法配送", - ErrorOrderSkuPrice: "商品价格错误", - ErrorOrderAmount: "订单金额错误", - ErrorOrderLadingBill: "订单已提单", - ErrorOrderClose: "订单已关闭", - ErrorOrderTimeOut: "订单超时", - ErrorOrderError: "订单错误", - ErrorOrderUnPay: "订单未支付", - ErrorOrderInvalid: "订单失效", - ErrorOrderSkuInvalid: "订单商品错误", - ErrorAfterServiceTypeError: "售后类型错误", + ErrorSystem: "系统错误", + ErrorOrderRepeat: "重复下单", + ErrorOrderFreightFee: "运费错误", + ErrorOrderSubmit: "下单失败", + ErrorOrderShipment: "无法配送", + ErrorOrderSkuPrice: "商品价格错误", + ErrorOrderAmount: "订单金额错误", + ErrorOrderLadingBill: "订单已提单", + ErrorOrderClose: "订单已关闭", + ErrorOrderTimeOut: "订单超时", + ErrorOrderError: "订单错误", + ErrorOrderUnPay: "订单未支付", + ErrorOrderInvalid: "订单失效", + ErrorOrderSkuInvalid: "订单商品错误", + ErrorAfterServiceTypeError: "售后类型错误", + ErrorAfterServiceReasonError: "售后原因错误", } func (e Error) Error() string { diff --git a/supply/interface/afterService.go b/supply/interface/afterService.go index 0c546b5..aa83812 100644 --- a/supply/interface/afterService.go +++ b/supply/interface/afterService.go @@ -18,7 +18,7 @@ type AfterServiceInterface interface { // Reason 获取售后原因 Reason(ctx context.Context, args ArgsAfterServiceReason, reply *[]ReplyAfterServiceReason) error // Apply @Title 发起售后 - Apply(ctx context.Context, args ArgsAfterServiceApply, reply *ReplyAfterServiceApply) error + Apply(ctx context.Context, args ArgsAfterServiceApply, sourceAfsSn *string) error // LogisticsAddress @Title 寄回地址 LogisticsAddress(ctx context.Context, afterServiceSn string, reply *ReplyAfterServiceLogisticsAddress) error // BackLogisticsBill @Title 回传物流信息 @@ -54,7 +54,7 @@ type ReplyAfterServiceReason struct { } type ArgsAfterServiceApply struct { - Type string // 售后类型 + TypeId string // 售后类型 TypeName string // 售后名称 ReasonCode string // 售后原因编码 ReasonName string // 售后原因描述 @@ -64,11 +64,6 @@ type ArgsAfterServiceApply struct { Pictures []string // 图片地址数组 Quantity uint // 售后申请数量 } -type ReplyAfterServiceApply struct { - AfterServiceSn string `json:"afterServiceSn"` // 渠道售后单号 - ChannelAfterServiceSn string `json:"channelAfterServiceSn"` // 渠道售后单号 -} - type ReplyAfterServiceLogisticsAddress struct { Name string `json:"name"` // 姓名 Mobile string `json:"mobile"` // 手机号