Merge remote-tracking branch 'origin/mark' into don

business/model/dao/dao_bz.go

@@ -73,8 +73,24 @@ func BatchUpdateEntityByKV(db *DaoDB, items []*KVUpdateItem) (num int64, err err
 		// 		}
 		// 	}
 		// }()
-		for _, v := range items {
-			num2, err2 := UpdateEntityByKV(db, v.Item, v.KVs, nil)
+
+		var item *KVUpdateItem
+		defer func() {
+			if r := recover(); r != nil {
+				if item != nil {
+					var bindID int64
+					value := refutil.CheckAndGetStructValue(item.Item).FieldByName(model.FieldID)
+					if value.IsValid() {
+						bindID = value.Int()
+					}
+					globals.SugarLogger.Debugf("BatchUpdateEntityByKV panic, bindID:%d, KVs:%s", bindID, utils.Format4Output(item.KVs, true))
+				}
+				panic(r)
+			}
+		}()
+
+		for _, item = range items {
+			num2, err2 := UpdateEntityByKV(db, item.Item, item.KVs, nil)
 			if err = err2; err != nil {
 				return 0, err
 			}

business/model/dao/food_recipe_test.go

@@ -6,7 +6,7 @@ import (
 
 func TestQueryRecipes(t *testing.T) {
 	db := GetDB()
-	recipeList, err := QueryFoodRecipes(db, "", -1, "", "")
+	recipeList, _, err := QueryFoodRecipes(db, "", 0, "", "", 0, 0)
 	if err != nil {
 		t.Fatal(err)
 	}

business/model/dao/store_test.go

@@ -38,3 +38,11 @@ func TestGetStoreList4Role(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestGetStoresMapList(t *testing.T) {
+	storeList, err := GetStoresMapList(GetDB(), nil, nil, model.StoreStatusClosed, model.StoreIsSyncYes, "")
+	t.Log(utils.Format4Output(storeList, false))
+	if err != nil {
+		t.Fatal(err)
+	}
+}