- avoid "Transaction has already been committed or rolled back" in RefreshMissingDadaStores

This commit is contained in:
gazebo
2019-01-23 14:02:58 +08:00
parent 083c837a78
commit 148b64f659

View File

@@ -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,