From 98e873f0b2f660b6cc9bde56974f65cefc1fdb15 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 16 Apr 2019 09:28:02 +0800 Subject: [PATCH] =?UTF-8?q?-=20AgreeOrRefuseRefund=20renmae=20to=20AgreeOr?= =?UTF-8?q?RefuseCancel=20-=20=E4=BF=AE=E6=94=B9=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/partner.go | 2 +- business/partner/purchase/ebai/ebai.go | 4 +--- business/partner/purchase/ebai/order.go | 2 +- business/partner/purchase/elm/order.go | 2 +- business/partner/purchase/jd/order.go | 2 +- business/partner/purchase/mtwm/order.go | 2 +- business/partner/purchase/weimob/wsc/order.go | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/business/partner/partner.go b/business/partner/partner.go index 429a1a4f9..d1d970b75 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -159,7 +159,7 @@ type IPurchasePlatformHandler interface { ReplyOrderComment(ctx *jxcontext.Context, orderComment *model.OrderComment, replyComment string) (err error) - AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) + AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) // order.Skus要包含原始订单中的Sku信息，removedSkuList中是要移除的Sku信息 AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index e17c93481..de9c9b6b7 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -23,9 +23,7 @@ func init() { } func EbaiBusStatus2JxStatus(ebaiStatus int) int { - if ebaiStatus == ebaiapi.ShopBusStatusOffline { - return model.StoreStatusDisabled - } else if ebaiStatus == ebaiapi.ShopBusStatusSuspended { + if ebaiStatus == ebaiapi.ShopBusStatusHaveRest || ebaiStatus == ebaiapi.ShopBusStatusSuspended { return model.StoreStatusClosed } return model.StoreStatusOpened diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index ff31c562c..70df2407c 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -358,7 +358,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode return mobile, err } -func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { if globals.EnableEbaiStoreWrite { if isAgree { err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 068499069..b5c53a6a2 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -332,7 +332,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode return mobile, err } -func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { return err } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 3c0922507..546801545 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -299,7 +299,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode return mobile, err } -func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { if globals.EnableStoreWrite { err = api.JdAPI.OrderCancelOperate(order.VendorOrderID, isAgree, ctx.GetUserName(), reason) } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 1f1d37e36..cd730c7ee 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -314,7 +314,7 @@ func (c *PurchaseHandler) GetStatusActionTimeout(order *model.GoodsOrder, status return params } -func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { if globals.EnableMtwmStoreWrite { if isAgree { err = api.MtwmAPI.OrderRefundAgree(utils.Str2Int64(order.VendorOrderID), reason) diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go index f71750d00..356eadeba 100644 --- a/business/partner/purchase/weimob/wsc/order.go +++ b/business/partner/purchase/weimob/wsc/order.go @@ -342,7 +342,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode return mobile, err } -func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { return err }