- refactor mysql transaction

business/jxcallback/orderman/orderman_ext.go

@@ -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 {
 			pagedInfo.TotalCount = countInfo.Ct
 			pagedInfo.Data = waybills
-			return pagedInfo, nil
 		}
 	}
 	dao.Commit(db)
-	return nil, err
+	return pagedInfo, err
 }

business/jxstore/cms/sku.go

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

business/jxstore/cms/store.go

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

business/jxstore/cms/store_sku.go

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