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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-31 17:00:41 +08:00
parent b784fa92ca
commit 999765eb08
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/model/dao/act.go
View File

@@ -153,8 +153,8 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
// globals.SugarLogger.Debug(utils.Format4Output(actStoreSkuList, false))
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &actStoreSkuList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &actStoreSkuList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return totalCount, actStoreSkuList, err
}
@@ -300,11 +300,11 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
}
}()
// globals.SugarLogger.Debug(sql)
if err = GetRows(db, &idList, sql, sqlParams...); err != nil || len(idList) == 0 {
if err = GetRowsTx(txDB, &idList, sql, sqlParams...); err != nil || len(idList) == 0 {
Rollback(db, txDB)
return pagedInfo, err
}
pagedInfo.TotalCount = GetLastTotalRowCount(db)
pagedInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
Commit(db, txDB)
sql = `

12
business/model/dao/dao_order.go
View File

@@ -977,8 +977,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return orders, totalCount, err
}
@@ -1162,8 +1162,8 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs, statuss []int, vendorOrd
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &orderSupplementFee, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &orderSupplementFee, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return orderSupplementFee, totalCount, err
}
@@ -1355,8 +1355,8 @@ func GetAfsOrdersByPage(db *DaoDB, vendorOrderID, afsOrderID, userID string, fro
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &afsOrderList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &afsOrderList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return afsOrderList, totalCount, err
}

8
business/model/dao/dao_user.go
View File

@@ -96,8 +96,8 @@ func GetUsers(db *DaoDB, userType int, keyword string, userIDs, userID2s, mobile
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &userList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &userList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return userList, totalCount, err
}
@@ -213,8 +213,8 @@ func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offs
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &addressList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &addressList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return addressList, totalCount, err
}

4
business/model/dao/event.go
View File

@@ -110,8 +110,8 @@ func GetOperateEvents(db *DaoDB, name string, apiFunctions []string, operateType
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &operateEventExt, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &operateEventExt, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
var (
accessUUidList []string

4
business/model/dao/food_recipe.go
View File

@@ -82,8 +82,8 @@ func QueryFoodRecipes(db *DaoDB, keyword string, recipeID int, authorID, userID
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &recipeList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &recipeList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return recipeList, totalCount, err
}

4
business/model/dao/page_store.go
View File

@@ -88,9 +88,9 @@ func QueryPageStores(db *DaoDB, pageSize, offset int, keyword string, vendorStor
panic(r)
}
}()
if err = GetRows(db, &shopList, sql, sqlParams...); err == nil {
if err = GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db),
TotalCount: GetLastTotalRowCount2(db, txDB),
Data: shopList,
}
Commit(db, txDB)

4
business/model/dao/report.go
View File

@@ -319,8 +319,8 @@ func GetPriceReferSnapshot(db *DaoDB, cityCodes, skuIDs []int, skuNameID int, sn
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &priceReferSnapshot, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &priceReferSnapshot, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
for _, v := range priceReferSnapshot {
skuList, err2 := GetSkus(db, []int{v.SkuID}, nil, nil, nil, nil)

12
business/model/dao/store.go
View File

@@ -714,8 +714,8 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &StorePriceScore, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db)
if err = GetRowsTx(txDB, &StorePriceScore, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB)
}
return StorePriceScore, totalCount, err
}
@@ -981,9 +981,9 @@ func GetStoreAuditPage(db *DaoDB, statuss []int, keyword string, applyTimeStart,
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &requestList, sql, sqlParams...); err == nil {
if err = GetRowsTx(txDB, &requestList, sql, sqlParams...); err == nil {
return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db),
TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList,
}, nil
}
@@ -1247,9 +1247,9 @@ func GetStoreManageState(db *DaoDB, storeIDs, brandIDs []int, vendorID, sortType
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &requestList, sql, sqlParams...); err == nil {
if err = GetRowsTx(txDB, &requestList, sql, sqlParams...); err == nil {
return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db),
TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList,
}, nil
}

4
business/model/dao/store_sku.go
View File

@@ -1709,9 +1709,9 @@ func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss, types []int
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRows(db, &requestList, sql, sqlParams...); err == nil {
if err = GetRowsTx(txDB, &requestList, sql, sqlParams...); err == nil {
return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db),
TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList,
}, nil
}