diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 6bf475588..dea5ba173 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -85,10 +85,11 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName return err } func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { + ChangeOrderStatus(order.VendorOrderID, model.OrderStatusDelivering, "") return err } func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { - ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinished, "已完成") + ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinished, "") return err } func (p *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *model.GoodsOrder) (mobile string, err error) { @@ -102,6 +103,9 @@ func (p *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod } func (p *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, reason) + if order.EclpOutID != "" { + _, err = api.JdEclpAPI.CancelOrder(order.EclpOutID) + } return err } func (p *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {