liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- refactor mysql transaction

Browse Source
This commit is contained in:
gazebo
2018-11-05 15:22:30 +08:00
parent cf4bfb3dd8
commit 7c07d65c48
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/orderman_ext.go
View File

@@ -463,9 +463,8 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil { if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil {
pagedInfo.TotalCount = countInfo.Ct pagedInfo.TotalCount = countInfo.Ct
pagedInfo.Data = waybills pagedInfo.Data = waybills
return pagedInfo, nil
} }
} }
dao.Commit(db) dao.Commit(db)
return nil, err return pagedInfo, err
} }

6
business/jxstore/cms/sku.go
View File

@@ -335,12 +335,14 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter
for _, skuName := range skuNamesInfo.SkuNames { for _, skuName := range skuNamesInfo.SkuNames {
if skuName.SkusStr != "" { if skuName.SkusStr != "" {
if err = utils.UnmarshalUseNumber([]byte(skuName.SkusStr), &skuName.Skus); err != nil { if err = utils.UnmarshalUseNumber([]byte(skuName.SkusStr), &skuName.Skus); err != nil {
break dao.Rollback(db)
return nil, err
} }
} }
if skuName.PlacesStr != "" { if skuName.PlacesStr != "" {
if err = utils.UnmarshalUseNumber([]byte(skuName.PlacesStr), &skuName.Places); err != nil { if err = utils.UnmarshalUseNumber([]byte(skuName.PlacesStr), &skuName.Places); err != nil {
break dao.Rollback(db)
return nil, err
} }
} }
} }

2
business/jxstore/cms/store.go
View File

@@ -214,11 +214,13 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
for _, v := range retVal.Stores { for _, v := range retVal.Stores {
if v.StoreMapStr != "" { if v.StoreMapStr != "" {
if err = utils.UnmarshalUseNumber([]byte(v.StoreMapStr), &v.StoreMaps); err != nil { if err = utils.UnmarshalUseNumber([]byte(v.StoreMapStr), &v.StoreMaps); err != nil {
dao.Rollback(db)
return nil, err return nil, err
} }
} }
if v.CourierMapStr != "" { if v.CourierMapStr != "" {
if err = utils.UnmarshalUseNumber([]byte(v.CourierMapStr), &v.CourierMaps); err != nil { if err = utils.UnmarshalUseNumber([]byte(v.CourierMapStr), &v.CourierMaps); err != nil {
dao.Rollback(db)
return nil, err return nil, err
} }
} }

3
business/jxstore/cms/store_sku.go
View File

@@ -214,7 +214,8 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str
for _, skuName := range skuNamesInfo.SkuNames { for _, skuName := range skuNamesInfo.SkuNames {
if skuName.SkusStr != "" { if skuName.SkusStr != "" {
if err = utils.UnmarshalUseNumber([]byte(skuName.SkusStr), &skuName.Skus); err != nil { if err = utils.UnmarshalUseNumber([]byte(skuName.SkusStr), &skuName.Skus); err != nil {
break dao.Rollback(db)
return nil, err
} }
if len(skuName.Skus) > 0 { if len(skuName.Skus) > 0 {
skuName.UnitPrice = int(utils.MustInterface2Int64(skuName.Skus[0]["unitPrice"])) skuName.UnitPrice = int(utils.MustInterface2Int64(skuName.Skus[0]["unitPrice"]))