aa

business/jxcallback/orderman/orderman_ext.go

@@ -24,7 +24,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
-	"github.com/astaxie/beego/adapter/orm"
+	"github.com/astaxie/beego/client/orm"
 )
 
 const (
@@ -570,10 +570,10 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
 	sqlParams = append(sqlParams, pageSize, offset)
 	var waybills []*tWaybillExt
 	db := dao.GetDB()
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -583,7 +583,7 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
 			Data:       waybills,
 		}
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return pagedInfo, err
 }
 
@@ -703,10 +703,10 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
 
 	var orders []*model.OrderFinancialExt
 	db := dao.GetDB()
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -716,7 +716,7 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
 			Data:       orders,
 		}
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 
 	return pagedInfo, err
 }
@@ -1020,10 +1020,10 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
 
 	var orders []*model.AfsOrder
 	db := dao.GetDB()
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil || err != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			if r != nil {
 				panic(r)
 			}
@@ -1034,7 +1034,7 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
 			TotalCount: dao.GetLastTotalRowCount(db),
 			Data:       orders,
 		}
-		dao.Commit(db)
+		dao.Commit(db, txDB)
 	}
 	return pagedInfo, err
 }