From 84b4d400e428b82cc1d377d4d49ec31c8dec7ef4 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 11 Sep 2019 22:59:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20BatchUpdateEntityByKV=E4=B8=AD=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/dao_bz.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/business/model/dao/dao_bz.go b/business/model/dao/dao_bz.go
index a653b54ee..70838b7c5 100644
--- a/business/model/dao/dao_bz.go
+++ b/business/model/dao/dao_bz.go
@@ -63,15 +63,16 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c
 
 func BatchUpdateEntityByKV(db *DaoDB, items []*KVUpdateItem) (num int64, err error) {
 	if len(items) > 0 {
-		Begin(db)
-		defer func() {
-			if r := recover(); r != nil || err != nil {
-				Rollback(db)
-				if r != nil {
-					panic(r)
-				}
-			}
-		}()
+		// 不用事务应该是OK的吧，用事务经常会导致死锁（不同平台在同步同一条数据）
+		// Begin(db)
+		// defer func() {
+		// 	if r := recover(); r != nil || err != nil {
+		// 		Rollback(db)
+		// 		if r != nil {
+		// 			panic(r)
+		// 		}
+		// 	}
+		// }()
 		for _, v := range items {
 			num2, err2 := UpdateEntityByKV(db, v.Item, v.KVs, nil)
 			if err = err2; err != nil {
@@ -79,7 +80,7 @@ func BatchUpdateEntityByKV(db *DaoDB, items []*KVUpdateItem) (num int64, err err
 			}
 			num += num2
 		}
-		Commit(db)
+		// Commit(db)
 	}
 	return num, nil
 }