From 3f5fd127e3da7693aa57d0d7e656dc3b4010786b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 18 Mar 2020 09:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BB=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8A=A5=E9=94=99=E5=AD=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index a51dbdb26..ac8ee993f 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -923,8 +923,11 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 							errList.AddErr(err)
 						}
 					}
-					MarkArrears(db, order, orderPay)
-					err = CancelMatterOrder(db, order, reason)
+					if err == nil{
+						MarkArrears(db, order, orderPay)
+						err2 := CancelMatterOrder(db, order, reason)
+						errList.AddErr(err2)
+					}	
 				} else {
 					orderPay.Status = model.PayStatusCanceled
 					_, err2 := dao.UpdateEntity(db, orderPay)