- CancelOrder

business/partner/purchase/jd/order.go

@@ -393,8 +393,12 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
 
 func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
 	if globals.EnableJdStoreWrite {
-		c.Swtich2SelfDeliver(order, ctx.GetUserName())
-		err = api.JdAPI.CancelAndRefund(order.VendorOrderID, ctx.GetUserName(), reason)
+		err1 := c.Swtich2SelfDeliver(order, ctx.GetUserName())
+		if err = api.JdAPI.CancelAndRefund(order.VendorOrderID, ctx.GetUserName(), reason); err != nil {
+			if err1 != nil {
+				err = fmt.Errorf("取消订单失败，京东取消订单是要先转为自送再处理，转自送失败:%v", err1)
+			}
+		}
 	}
 	return err
 }