From 999765eb08756b5e9ed59f1e916ae24474f4ed40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 31 Mar 2021 17:00:41 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/orderman_ext.go | 12 ++++++------
 business/jxstore/cms/message.go              |  8 ++++----
 business/jxstore/cms/store.go                |  4 ++--
 business/jxstore/cms/store_sku.go            | 18 +++++++++---------
 business/model/dao/act.go                    |  8 ++++----
 business/model/dao/dao_order.go              | 12 ++++++------
 business/model/dao/dao_user.go               |  8 ++++----
 business/model/dao/event.go                  |  4 ++--
 business/model/dao/food_recipe.go            |  4 ++--
 business/model/dao/page_store.go             |  4 ++--
 business/model/dao/report.go                 |  4 ++--
 business/model/dao/store.go                  | 12 ++++++------
 business/model/dao/store_sku.go              |  4 ++--
 business/partner/purchase/jx/localjx/user.go |  6 +++---
 14 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 4fa10127c..5c768413c 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -577,9 +577,9 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
 			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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			Data:       waybills,
 		}
 	}
@@ -710,9 +710,9 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
 			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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			Data:       orders,
 		}
 		dao.Commit(db, txDB)
diff --git a/business/jxstore/cms/message.go b/business/jxstore/cms/message.go
index 57d0b5f82..d518f29e3 100644
--- a/business/jxstore/cms/message.go
+++ b/business/jxstore/cms/message.go
@@ -69,9 +69,9 @@ func GetStoreMessages(ctx *jxcontext.Context, msgIDs, storeIDs, types []int, fro
 	defer dao.Commit(db, txDB)
 	var msgList []*model.Message
 	// 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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			Data:       msgList,
 		}
 	}
@@ -129,9 +129,9 @@ func GetStoreMessageStatuses(ctx *jxcontext.Context, msgIDs, storeIDs, confirmSt
 	var msgStatusList []*MessageStatusExt
 	// globals.SugarLogger.Debug(sql)
 	// 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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			Data:       msgStatusList,
 		}
 	}
diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index c519209d0..97dc5ecae 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1605,9 +1605,9 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeI
 	}()
 	// globals.SugarLogger.Debug(sql)
 	// 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{}{
-			"total": dao.GetLastTotalRowCount(db),
+			"total": dao.GetLastTotalRowCount2(db, txDB),
 			"list":  commentList,
 		}
 		dao.Commit(db, txDB)
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 652764e6c..8539d36f5 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -371,11 +371,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
 	sqlParams = append(sqlParams, pageSize, offset)
 	txDB, _ := dao.Begin(db)
 	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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 		}
-		// skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db)
+		// skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
 		for _, v := range SkuNames {
 			var skus []*dao.StoreSkuExt
 			sql2 := `
@@ -741,12 +741,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
 		sqlParams2 = append(sqlParams2, sqlParamsPage)
 		var storeNameList []*tStoreNameBind
 		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)
 			return nil, err
 		}
 		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"
 		for _, v := range storeNameList {
 			sql += " OR (t1.id = ? AND t3.id = ?)"
@@ -784,12 +784,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
 	}
 	var tmpList []*tGetStoresSkusInfo
 	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)
 		return nil, err
 	}
 	if isBySku {
-		skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db)
+		skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
 	}
 	dao.Commit(db, txDB)
 	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
 		txDB, _ := dao.Begin(db)
 		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{
-				TotalCount: dao.GetLastTotalRowCount(db),
+				TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 				Data:       requestList,
 			}, nil
 		}
diff --git a/business/model/dao/act.go b/business/model/dao/act.go
index 8ccf6a448..71049429f 100644
--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -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 = `
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 387a5dcde..164107104 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -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
 }
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index 54902a77c..cc625908d 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -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
 }
diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index 13a3cd4bc..c735fd261 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -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
diff --git a/business/model/dao/food_recipe.go b/business/model/dao/food_recipe.go
index 79ff2188f..02a2152c6 100644
--- a/business/model/dao/food_recipe.go
+++ b/business/model/dao/food_recipe.go
@@ -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
 }
diff --git a/business/model/dao/page_store.go b/business/model/dao/page_store.go
index 725a61da1..b343d23f0 100644
--- a/business/model/dao/page_store.go
+++ b/business/model/dao/page_store.go
@@ -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)
diff --git a/business/model/dao/report.go b/business/model/dao/report.go
index 59fb7620a..e00f65c45 100644
--- a/business/model/dao/report.go
+++ b/business/model/dao/report.go
@@ -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)
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 120be8913..2d57b9e0e 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -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
 	}
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 66fc01492..72e47e10b 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -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
 	}
diff --git a/business/partner/purchase/jx/localjx/user.go b/business/partner/purchase/jx/localjx/user.go
index b487ca06b..7bde8d75a 100644
--- a/business/partner/purchase/jx/localjx/user.go
+++ b/business/partner/purchase/jx/localjx/user.go
@@ -59,11 +59,11 @@ func GetJxShopUsers(ctx *jxcontext.Context, keyword, fromTime, toTime string, ve
 	sql += "LIMIT ? OFFSET ?"
 	pageSize = jxutils.FormalizePageSize(pageSize)
 	sqlParams = append(sqlParams, pageSize, offset)
-	txDB , _ := dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	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{
-			TotalCount: dao.GetLastTotalRowCount(db),
+			TotalCount: dao.GetLastTotalRowCount2(db, txDB),
 			// Data:       requestList,
 		}
 		for _, v := range requestList {