From 07574ae12af323f5f59d1d55d13db3f2ddaa5a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 19 Jun 2020 17:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=8B=A5?=
 =?UTF-8?q?=E6=98=AF=E4=BB=8E=E4=BB=93=E5=BA=93=E5=8F=91=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=20=E5=88=99=E8=A6=81=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/order.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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) {