aa

business/jxcallback/orderman/orderman.go

@@ -70,11 +70,11 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db *dao.DaoDB) (isDuplic
 	} else {
 		globals.SugarLogger.Debugf("addOrderStatus afsOrder:%v", status)
 	}
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil || err != nil {
 			globals.SugarLogger.Debug("rollback")
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			if r != nil {
 				panic(r)
 			}
@@ -98,7 +98,7 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db *dao.DaoDB) (isDuplic
 		// todo 这里居然会有主键重复错误，逻辑上是不应该的
 		globals.SugarLogger.Warnf("addOrderOrWaybillStatus status:%v, access db error:%v", status, err)
 	} else {
-		dao.Commit(db)
+		dao.Commit(db, txDB)
 	}
 	return isDuplicated, err
 }