! orderman中尽量使用事务

! orderman中全换成dao.DaoDB

business/jxcallback/orderman/orderman.go

@@ -9,9 +9,9 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
 )
 
 const (
@@ -62,22 +62,31 @@ func init() {
 	partner.InitOrderManager(FixedOrderManager)
 }
 
-func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) {
+func addOrderOrWaybillStatus(status *model.OrderStatus, db *dao.DaoDB) (isDuplicated bool, err error) {
 	if status.OrderType == model.OrderTypeOrder {
 		globals.SugarLogger.Debugf("addOrderStatus order:%v", status)
 	} else {
 		globals.SugarLogger.Debugf("addOrderStatus waybill:%v", status)
 	}
-
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil || err != nil {
+			globals.SugarLogger.Debug("rollback")
+			dao.Rollback(db)
+			if r != nil {
+				panic(r)
+			}
+		}
+	}()
 	status.ID = 0
-	created, _, err := db.ReadOrCreate(status, "VendorOrderID", "VendorID", "OrderType", "VendorStatus", "StatusTime")
+	created, _, err := db.Db.ReadOrCreate(status, "VendorOrderID", "VendorID", "OrderType", "VendorStatus", "StatusTime")
 	if err == nil {
 		if !created {
 			globals.SugarLogger.Debugf("duplicated event:%v", status)
 			isDuplicated = true
 			status.DuplicatedCount++
 			utils.CallFuncLogError(func() error {
-				_, err = db.Update(status, "DuplicatedCount")
+				_, err = db.Db.Update(status, "DuplicatedCount")
 				return err
 			}, "addOrderOrWaybillStatus update DuplicatedCount, status:%v", status)
 		}
@@ -85,6 +94,8 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica
 	if err != nil {
 		// todo 这里居然会有主键重复错误，逻辑上是不应该的
 		globals.SugarLogger.Warnf("addOrderOrWaybillStatus status:%v, access db error:%v", status, err)
+	} else {
+		dao.Commit(db)
 	}
 	return isDuplicated, err
 }