aa

business/jxcallback/orderman/waybill.go

@@ -15,7 +15,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/adapter/orm"
+	"github.com/astaxie/beego/client/orm"
 )
 
 var (
@@ -107,10 +107,10 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
 	}
 	bill.CourierMobile = jxutils.FormalizeMobile(bill.CourierMobile)
 	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)
 		}
 	}()
@@ -133,21 +133,21 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
 					billCopy := *bill
 					billCopy.Status = model.WaybillStatusNew
 					if isDuplicated, err = w.onWaybillNew(&billCopy, db); err != nil {
-						dao.Rollback(db)
+						dao.Rollback(db, txDB)
 						return err
 					}
-					dao.Commit(db)
+					dao.Commit(db, txDB)
 					// 进运单调度器OnWaybillStatusChanged之前要确保事务是提交了的，否则会导致死锁
 					scheduler.CurrentScheduler.OnWaybillStatusChanged(&billCopy, false)
 					dao.Begin(db)
 				} else {
-					dao.Rollback(db)
+					dao.Rollback(db, txDB)
 					return err2
 				}
 			}
 			// 运单消息错序，之前已经结束了，直接返回
 			if existingBill.Status >= model.WaybillStatusEndBegin {
-				dao.Commit(db)
+				dao.Commit(db, txDB)
 				return nil
 			}
 		}
@@ -171,17 +171,17 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
 		}
 		duplicatedCount, err = w.addWaybillStatus(bill, db, addParams)
 		if err != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			return err
 		}
 	}
 	if err == nil {
-		dao.Commit(db)
+		dao.Commit(db, txDB)
 		if duplicatedCount == 0 {
 			scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, false)
 		}
 	} else {
-		dao.Rollback(db)
+		dao.Rollback(db, txDB)
 	}
 	if bill.VendorOrderID == bill.VendorWaybillID {
 		if status, ok := waybillOrderStatusMap[bill.Status]; ok {