From 92cdb1d9754c7eb6f1233346b71b719b0001d982 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Sep 2019 15:12:59 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E5=A4=96=E5=8D=96=E5=94=AE=E5=90=8E=E5=8D=95=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86bug=EF=BC=8C=E5=AF=B9=E4=BA=8EnotifyType=E4=B8=8EresTy?= =?UTF-8?q?pe=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/order_afs.go | 40 +++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 1a4b25d2a..41b98ad4a 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -16,16 +16,24 @@ import ( ) var ( - AfsVendorStatus2StatusMap = map[int]int{ - mtwmapi.ResTypePending: model.AfsOrderStatusWait4Approve, - mtwmapi.ResTypeMerchantRefused: model.AfsOrderStatusFailed, - mtwmapi.ResTypeMerchantAgreed: model.AfsOrderStatusFinished, - mtwmapi.ResTypeCSRefused: model.AfsOrderStatusFailed, - mtwmapi.ResTypeCSAgreed: model.AfsOrderStatusFinished, - mtwmapi.ResTypeTimeoutAutoAgreed: model.AfsOrderStatusFinished, - mtwmapi.ResTypeAutoAgreed: model.AfsOrderStatusFinished, - mtwmapi.ResTypeUserCancelApply: model.AfsOrderStatusFailed, - mtwmapi.ResTypeUserCancelComplain: model.AfsOrderStatusFailed, + // AfsVendorStatus2StatusMap = map[int]int{ + // mtwmapi.ResTypePending: model.AfsOrderStatusWait4Approve, + // mtwmapi.ResTypeMerchantRefused: model.AfsOrderStatusFailed, + // mtwmapi.ResTypeMerchantAgreed: model.AfsOrderStatusFinished, + // mtwmapi.ResTypeCSRefused: model.AfsOrderStatusFailed, + // mtwmapi.ResTypeCSAgreed: model.AfsOrderStatusFinished, + // mtwmapi.ResTypeTimeoutAutoAgreed: model.AfsOrderStatusFinished, + // mtwmapi.ResTypeAutoAgreed: model.AfsOrderStatusFinished, + // mtwmapi.ResTypeUserCancelApply: model.AfsOrderStatusFailed, + // mtwmapi.ResTypeUserCancelComplain: model.AfsOrderStatusFailed, + // } + AfsVendorStatus2StatusMap = map[string]int{ + mtwmapi.NotifyTypeApply: model.AfsOrderStatusWait4Approve, + mtwmapi.NotifyTypePartyApply: model.AfsOrderStatusWait4Approve, + mtwmapi.NotifyTypeSuccess: model.AfsOrderStatusFinished, + mtwmapi.NotifyTypeReject: model.AfsOrderStatusFailed, + mtwmapi.NotifyTypeCancelRefund: model.AfsOrderStatusFailed, + mtwmapi.NotifyTypeCancelRefundComplaint: model.AfsOrderStatusFailed, } ) @@ -138,8 +146,8 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *mtwmapi.CallbackMsg) (order OrderType: model.OrderTypeAfsOrder, RefVendorOrderID: utils.Int64ToStr(refundData.OrderID), RefVendorID: model.VendorIDMTWM, - VendorStatus: utils.Int2Str(refundData.ResType), - Status: c.GetAfsStatusFromVendorStatus(refundData.ResType), + VendorStatus: fmt.Sprintf("%s:%d", refundData.NotifyType, refundData.ResType), + Status: c.GetAfsStatusFromVendorStatus(refundData.ResType, refundData.NotifyType), StatusTime: utils.Timestamp2Time(refundData.Timestamp), Remark: refundData.Reason, } @@ -149,8 +157,12 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *mtwmapi.CallbackMsg) (order return orderStatus } -func (c *PurchaseHandler) GetAfsStatusFromVendorStatus(vendorStatus int) int { - return AfsVendorStatus2StatusMap[vendorStatus] +func (c *PurchaseHandler) GetAfsStatusFromVendorStatus(resType int, notifyType string) int { + status := AfsVendorStatus2StatusMap[notifyType] + if status == model.AfsOrderStatusWait4Approve && resType != mtwmapi.ResTypePending { + status = model.AfsOrderStatusNew + } + return status } // 审核售后单申请