From 935b3064d22655d4e03ea0c1ab2b4f7d963f9743 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, 25 Sep 2020 09:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index b6bf7facd..a7944759e 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1867,16 +1867,18 @@ func UpdateOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int,
 	)
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
 	valid := dao.StrictMakeMapByStructObject(payload, order, ctx.GetUserName())
-	dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
+	if valid != nil {
+		dao.Begin(db)
+		defer func() {
+			if r := recover(); r != nil {
+				dao.Rollback(db)
+				panic(r)
+			}
+		}()
+		if num, err = dao.UpdateEntityByKV(db, order, valid, nil); err != nil {
 			dao.Rollback(db)
-			panic(r)
+			return 0, err
 		}
-	}()
-	if num, err = dao.UpdateEntityByKV(db, order, valid, nil); err != nil {
-		dao.Rollback(db)
-		return 0, err
 	}
 	dao.Commit(db)
 	return num, err