From 148b64f659ef8aad1ae962bd6f64116452e57b12 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 23 Jan 2019 14:02:58 +0800 Subject: [PATCH] - avoid "Transaction has already been committed or rolled back" in RefreshMissingDadaStores --- business/jxstore/cms/store.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f23548d8b..42c599e92 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -461,8 +461,8 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID err = ErrCanNotFindVendor } if err == nil && vendorID == model.VendorIDJD { - db2 := dao.GetDB() - storeDetailList, err2 := dao.GetMissingDadaStores(db2, storeID) + db := dao.GetDB() + storeDetailList, err2 := dao.GetMissingDadaStores(db, storeID) if err = err2; err == nil { storeDetail := storeDetailList[0] if _, err = api.DadaAPI.ShopAdd(utils.Int2Str(storeID), storeDetail.Name, dadaapi.BusinessTypeFruitVegetable, storeDetail.CityName, @@ -732,6 +732,7 @@ func RefreshMissingDadaStores(ctx *jxcontext.Context, isAsync, isContinueWhenErr } } if err == nil { + db := dao.GetDB() _, err = AddStoreCourierMap(ctx, db, storeDetail.ID, model.VendorIDDada, &model.StoreCourierMap{ VendorStoreID: utils.Int2Str(storeDetail.ID), Status: model.StoreStatusOpened,