物料主订单取消报错子订单不变

2020-03-18 09:42:47 +08:00
parent 679a9919fa
commit 3f5fd127e3
1 changed files with 5 additions and 2 deletions
--- 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)