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

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

@@ -577,9 +577,9 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
panic(r) panic(r)
} }
}() }()
if err = dao.GetRows(db, &waybills, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &waybills, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: waybills, Data: waybills,
} }
} }
@@ -710,9 +710,9 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
panic(r) panic(r)
} }
}() }()
if err = dao.GetRows(db, &orders, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: orders, Data: orders,
} }
} }
@@ -1029,9 +1029,9 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
} }
} }
}() }()
if err = dao.GetRows(db, &orders, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: orders, Data: orders,
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)

8
business/jxstore/cms/message.go
View File

@@ -69,9 +69,9 @@ func GetStoreMessages(ctx *jxcontext.Context, msgIDs, storeIDs, types []int, fro
defer dao.Commit(db, txDB) defer dao.Commit(db, txDB)
var msgList []*model.Message var msgList []*model.Message
// globals.SugarLogger.Debug(sql) // globals.SugarLogger.Debug(sql)
if err = dao.GetRows(db, &msgList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &msgList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: msgList, Data: msgList,
} }
} }
@@ -129,9 +129,9 @@ func GetStoreMessageStatuses(ctx *jxcontext.Context, msgIDs, storeIDs, confirmSt
var msgStatusList []*MessageStatusExt var msgStatusList []*MessageStatusExt
// globals.SugarLogger.Debug(sql) // globals.SugarLogger.Debug(sql)
// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) // globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
if err = dao.GetRows(db, &msgStatusList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &msgStatusList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: msgStatusList, Data: msgStatusList,
} }
} }

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

@@ -1605,9 +1605,9 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeI
}() }()
// globals.SugarLogger.Debug(sql) // globals.SugarLogger.Debug(sql)
// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) // globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
if err = dao.GetRows(db, &commentList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &commentList, sql, sqlParams...); err == nil {
retVal = map[string]interface{}{ retVal = map[string]interface{}{
"total": dao.GetLastTotalRowCount(db), "total": dao.GetLastTotalRowCount2(db, txDB),
"list": commentList, "list": commentList,
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)

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

@@ -371,11 +371,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer dao.Commit(db, txDB) defer dao.Commit(db, txDB)
if err = dao.GetRows(db, &SkuNames, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil {
skuNamesInfo = &dao.StoreSkuNamesInfo{ skuNamesInfo = &dao.StoreSkuNamesInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
} }
// skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db) // skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
for _, v := range SkuNames { for _, v := range SkuNames {
var skus []*dao.StoreSkuExt var skus []*dao.StoreSkuExt
sql2 := ` sql2 := `
@@ -741,12 +741,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
sqlParams2 = append(sqlParams2, sqlParamsPage) sqlParams2 = append(sqlParams2, sqlParamsPage)
var storeNameList []*tStoreNameBind var storeNameList []*tStoreNameBind
beginTime := time.Now() beginTime := time.Now()
if err = dao.GetRows(db, &storeNameList, sql2, sqlParams2...); err != nil { if err = dao.GetRowsTx(txDB, &storeNameList, sql2, sqlParams2...); err != nil {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return nil, err return nil, err
} }
globals.SugarLogger.Debugf("GetStoresSkusNew get result1:%v", time.Now().Sub(beginTime)) globals.SugarLogger.Debugf("GetStoresSkusNew get result1:%v", time.Now().Sub(beginTime))
skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db) skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
sql += " AND (1 = 0" sql += " AND (1 = 0"
for _, v := range storeNameList { for _, v := range storeNameList {
sql += " OR (t1.id = ? AND t3.id = ?)" sql += " OR (t1.id = ? AND t3.id = ?)"
@@ -784,12 +784,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
} }
var tmpList []*tGetStoresSkusInfo var tmpList []*tGetStoresSkusInfo
beginTime := time.Now() beginTime := time.Now()
if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil { if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return nil, err return nil, err
} }
if isBySku { if isBySku {
skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db) skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
globals.SugarLogger.Debugf("GetStoresSkusNew get result2:%v", time.Now().Sub(beginTime)) globals.SugarLogger.Debugf("GetStoresSkusNew get result2:%v", time.Now().Sub(beginTime))
@@ -2450,9 +2450,9 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw
var requestList []*StoreOpRequestInfo var requestList []*StoreOpRequestInfo
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer dao.Commit(db, txDB) defer dao.Commit(db, txDB)
if err = dao.GetRows(db, &requestList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &requestList, sql, sqlParams...); err == nil {
return &model.PagedInfo{ return &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: requestList, Data: requestList,
}, nil }, nil
} }

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)) // globals.SugarLogger.Debug(utils.Format4Output(actStoreSkuList, false))
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &actStoreSkuList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &actStoreSkuList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return totalCount, actStoreSkuList, err return totalCount, actStoreSkuList, err
} }
@@ -300,11 +300,11 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
} }
}() }()
// globals.SugarLogger.Debug(sql) // 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) Rollback(db, txDB)
return pagedInfo, err return pagedInfo, err
} }
pagedInfo.TotalCount = GetLastTotalRowCount(db) pagedInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
Commit(db, txDB) Commit(db, txDB)
sql = ` 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) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &orders, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return orders, totalCount, err return orders, totalCount, err
} }
@@ -1162,8 +1162,8 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs, statuss []int, vendorOrd
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &orderSupplementFee, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &orderSupplementFee, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return orderSupplementFee, totalCount, err return orderSupplementFee, totalCount, err
} }
@@ -1355,8 +1355,8 @@ func GetAfsOrdersByPage(db *DaoDB, vendorOrderID, afsOrderID, userID string, fro
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &afsOrderList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &afsOrderList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return afsOrderList, totalCount, err 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) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &userList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &userList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return userList, totalCount, err return userList, totalCount, err
} }
@@ -213,8 +213,8 @@ func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offs
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &addressList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &addressList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return addressList, totalCount, err 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) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &operateEventExt, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &operateEventExt, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
var ( var (
accessUUidList []string 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) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &recipeList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &recipeList, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return recipeList, totalCount, err 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) panic(r)
} }
}() }()
if err = GetRows(db, &shopList, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db), TotalCount: GetLastTotalRowCount2(db, txDB),
Data: shopList, Data: shopList,
} }
Commit(db, txDB) 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) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &priceReferSnapshot, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &priceReferSnapshot, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
for _, v := range priceReferSnapshot { for _, v := range priceReferSnapshot {
skuList, err2 := GetSkus(db, []int{v.SkuID}, nil, nil, nil, nil) 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) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRows(db, &StorePriceScore, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &StorePriceScore, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount(db) totalCount = GetLastTotalRowCount2(db, txDB)
} }
return StorePriceScore, totalCount, err return StorePriceScore, totalCount, err
} }
@@ -981,9 +981,9 @@ func GetStoreAuditPage(db *DaoDB, statuss []int, keyword string, applyTimeStart,
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) 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{ return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db), TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList, Data: requestList,
}, nil }, nil
} }
@@ -1247,9 +1247,9 @@ func GetStoreManageState(db *DaoDB, storeIDs, brandIDs []int, vendorID, sortType
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) 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{ return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db), TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList, Data: requestList,
}, nil }, 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) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) 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{ return &model.PagedInfo{
TotalCount: GetLastTotalRowCount(db), TotalCount: GetLastTotalRowCount2(db, txDB),
Data: requestList, Data: requestList,
}, nil }, nil
} }

6
business/partner/purchase/jx/localjx/user.go
View File

@@ -59,11 +59,11 @@ func GetJxShopUsers(ctx *jxcontext.Context, keyword, fromTime, toTime string, ve
sql += "LIMIT ? OFFSET ?" sql += "LIMIT ? OFFSET ?"
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB , _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer dao.Commit(db, txDB) defer dao.Commit(db, txDB)
if err = dao.GetRows(db, &requestList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &requestList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
// Data: requestList, // Data: requestList,
} }
for _, v := range requestList { for _, v := range requestList {