fix:orm替换

models/company.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/custom/contract/contract_service.go

@@ -1,7 +1,7 @@
 package contract
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
 	"time"
 )

models/custom/wechat.go

@@ -1,6 +1,6 @@
 package custom
 
-import "github.com/rdlucklib/rdluck_tools/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type WechatSign struct {
 	AppId     string

models/db_init.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/roadshow"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/admin_record"
@@ -53,6 +53,9 @@ func init() {
 	report_db, _ := orm.GetDB("rddp")
 	report_db.SetConnMaxLifetime(10 * time.Minute)
 
+	orm.Debug = true
+	orm.DebugLog = orm.NewLog(utils.Binlog)
+
 	//注册对象
 	orm.RegisterModel(
 		new(admin.Admin),

models/roadshow/calendar.go

@@ -1,7 +1,7 @@
 package roadshow
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"time"

models/roadshow/company.go

@@ -1,7 +1,7 @@
 package roadshow
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -35,7 +35,6 @@ type CompanyDetailView struct {
 	ReportReadTotal int    `description:"累计阅读次数"`
 }
 
-
 type CompanyProduct struct {
 	CompanyProductId    int       `orm:"column(company_product_id);pk" description:"客户产品id"`
 	CompanyId           int       `description:"客户id"`
@@ -110,4 +109,4 @@ func GetCompanyProductReportPermissionList(companyId, productId int) (items []*C
 	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id = ? and a.product_id=? `
 	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
 	return
-}
+}

models/roadshow/rs_calendar_relation.go

@@ -1,7 +1,7 @@
 package roadshow
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/utils"
 	"strconv"
@@ -92,12 +92,15 @@ func SyncRsCalendarRelation(thirdUserCalendar UserCalendar, createUser admin.Adm
 	currentEndTimer := time.Unix(int64(thirdUserCalendar.EndTime), 0)
 
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -122,7 +125,7 @@ func SyncRsCalendarRelation(thirdUserCalendar UserCalendar, createUser admin.Adm
 		ModifyTime:       time.Now(),
 		ActivityCategory: "",
 	}
-	rsCalendarId, err := o.Insert(rsCalendar)
+	rsCalendarId, err := tx.Insert(rsCalendar)
 	if err != nil {
 		return
 	}
@@ -149,7 +152,7 @@ func SyncRsCalendarRelation(thirdUserCalendar UserCalendar, createUser admin.Adm
 			//RefuseTime:             time.Time{},
 			DeleteReason: "",
 		}
-		rsCalendarResearcherId, tmpErr := o.Insert(rsCalendarResearcher)
+		rsCalendarResearcherId, tmpErr := tx.Insert(rsCalendarResearcher)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -189,7 +192,7 @@ func SyncRsCalendarRelation(thirdUserCalendar UserCalendar, createUser admin.Adm
 		ModifyTime:       time.Now(),
 		CreateTime:       time.Now(),
 	}
-	rsCalendarRelationId, err := o.Insert(rsCalendarRelation)
+	rsCalendarRelationId, err := tx.Insert(rsCalendarRelation)
 	if err != nil {
 		return
 	}
@@ -207,19 +210,22 @@ func UpdateSyncRsCalendarRelation(thirdUserCalendar UserCalendar, rsCalendar *Rs
 	//删除研究员
 	//更新研究员
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
 	// 路演活动表修改
 	rsCalendar.Title = thirdUserCalendar.Title
 	rsCalendar.ModifyTime = time.Now()
-	_, err = o.Update(rsCalendar, "Title", "ModifyTime")
+	_, err = tx.Update(rsCalendar, "Title", "ModifyTime")
 	if err != nil {
 		return
 	}
@@ -228,7 +234,7 @@ func UpdateSyncRsCalendarRelation(thirdUserCalendar UserCalendar, rsCalendar *Rs
 	if len(delResearcherIdList) > 0 {
 		delResearcherIdStr := utils.Implode(delResearcherIdList)
 		sql := `DELETE FROM rs_calendar_researcher WHERE rs_calendar_researcher_id in (` + delResearcherIdStr + `) `
-		_, tmpErr := o.Raw(sql).Exec()
+		_, tmpErr := tx.Raw(sql).Exec()
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -244,7 +250,7 @@ func UpdateSyncRsCalendarRelation(thirdUserCalendar UserCalendar, rsCalendar *Rs
 		rsCalendarResearcher.StartWeek = utils.StrDateTimeToWeek(currentStartTimer.Weekday().String())
 		rsCalendarResearcher.EndWeek = utils.StrDateTimeToWeek(currentEndTimer.Weekday().String())
 		rsCalendarResearcher.ModifyTime = time.Now()
-		_, tmpErr := o.Update(rsCalendar, "StartDate", "EndDate", "StartTime", "EndTime", "StartWeek", "EndWeek", "ModifyTime")
+		_, tmpErr := tx.Update(rsCalendar, "StartDate", "EndDate", "StartTime", "EndTime", "StartWeek", "EndWeek", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -272,7 +278,7 @@ func UpdateSyncRsCalendarRelation(thirdUserCalendar UserCalendar, rsCalendar *Rs
 			//RefuseTime:             time.Time{},
 			DeleteReason: "",
 		}
-		rsCalendarResearcherId, tmpErr := o.Insert(rsCalendarResearcher)
+		rsCalendarResearcherId, tmpErr := tx.Insert(rsCalendarResearcher)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -310,7 +316,7 @@ func UpdateSyncRsCalendarRelation(thirdUserCalendar UserCalendar, rsCalendar *Rs
 	rsCalendarRelation.Title = thirdUserCalendar.Title
 	rsCalendarRelation.ResearcherMobile = thirdUserCalendar.ResearcherMobile
 	rsCalendarRelation.ModifyTime = time.Now()
-	_, err = o.Update(rsCalendarRelation, "SelfCalendarId", "UserId", "UserPhone", "UserName", "ProjectName", "ProjectId", "CustomerId", "CustomerName", "CustomerSocial", "ProjectType", "ProjectFormType", "Room", "StartTime", "EndTime", "Content", "FeedExpert", "Title", "ResearcherMobile", "ModifyTime")
+	_, err = tx.Update(rsCalendarRelation, "SelfCalendarId", "UserId", "UserPhone", "UserName", "ProjectName", "ProjectId", "CustomerId", "CustomerName", "CustomerSocial", "ProjectType", "ProjectFormType", "Room", "StartTime", "EndTime", "Content", "FeedExpert", "Title", "ResearcherMobile", "ModifyTime")
 	return
 }
 

models/tables/admin/admin.go

@@ -2,7 +2,7 @@ package admin
 
 import (
 	//_ "github.com/go-sql-driver/mysql"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/custom"
 	"time"
 )

models/tables/admin_record/admin_record.go

@@ -1,7 +1,7 @@
 package admin_record
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/approval_flow/approval_flow.go

@@ -1,7 +1,7 @@
 package approval_flow
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow_node"
 	"time"
 )

models/tables/approval_flow_node/approval_flow_node.go

@@ -1,7 +1,7 @@
 package approval_flow_node
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company/company.go

@@ -2,7 +2,7 @@ package company
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
@@ -470,59 +470,62 @@ type DeletePptReq struct {
 
 func DeleteCompanyById(companyId int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	sql := `DELETE FROM company_product WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 	sql = `DELETE FROM company_report_permission WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	//联系人表
 	sql = `DELETE FROM wx_user WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	//联系人 与 销售 关系表
 	sql = `DELETE FROM user_seller_relation WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	//sql = `DELETE FROM company_operation_record WHERE company_id=? `
-	//_, err = o.Raw(sql, companyId).Exec()
+	//_, err = tx.Raw(sql, companyId).Exec()
 	//if err != nil {
 	//	return
 	//}
 
 	sql = `DELETE FROM company_contract WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	sql = `DELETE FROM company_contract_permission WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	sql = `DELETE FROM company WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	return
 }
 
@@ -782,12 +785,15 @@ type CompanyFreezeReq struct {
 //冻结客户
 func CompanyFreeze(companyId, productId int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -796,21 +802,21 @@ func CompanyFreeze(companyId, productId int) (err error) {
 
 	//修改用户产品状态
 	sql := `UPDATE company_product SET status='冻结',freeze_time=NOW(),modify_time=NOW(),start_date=?,end_date=?,freeze_start_date=?,freeze_end_date=?,try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, freezeStartDate, freezeEndDate, freezeStartDate, freezeEndDate, companyId, productId).Exec()
+	_, err = tx.Raw(sql, freezeStartDate, freezeEndDate, freezeStartDate, freezeEndDate, companyId, productId).Exec()
 	if err != nil {
 		return err
 	}
 
 	//修改产品权限状态为关闭
 	sql = `UPDATE company_report_permission SET status='关闭',start_date=?,end_date=?,modify_time=NOW() WHERE company_id= ? AND product_id = ? `
-	_, err = o.Raw(sql, freezeStartDate, freezeEndDate, companyId, productId).Exec()
+	_, err = tx.Raw(sql, freezeStartDate, freezeEndDate, companyId, productId).Exec()
 	if err != nil {
 		return err
 	}
 
 	//修改客户为关闭
 	sql = `UPDATE company SET type=3,last_updated_time=NOW(),start_date=?,end_date=? WHERE company_id=? `
-	_, err = o.Raw(sql, freezeStartDate, freezeEndDate, companyId).Exec()
+	_, err = tx.Raw(sql, freezeStartDate, freezeEndDate, companyId).Exec()
 	if err != nil {
 		return err
 	}
@@ -832,9 +838,9 @@ func ModifyCompanyDepartmentId(sellerId, departmentId int) (err error) {
 }
 
 type CompanyNameList struct {
-	CompanyId	int		`description:"客户ID"`
-	CompanyName	string	`description:"客户名称"`
-	CreditCode	string	`description:"社会统一信用码"`
+	CompanyId   int    `description:"客户ID"`
+	CompanyName string `description:"客户名称"`
+	CreditCode  string `description:"社会统一信用码"`
 }
 
 // GetCompanyNameList 获取客户名称列表
@@ -845,4 +851,4 @@ func GetCompanyNameList(condition string, pars []interface{}, startSize, pageSiz
 	sql += ` LIMIT ?,? `
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
-}
+}

models/tables/company_approval/company_approval.go

@@ -1,7 +1,7 @@
 package company_approval
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/company_delay_permission"
 	"hongze/hongze_mobile_admin/models/tables/company_permission_log"
@@ -33,22 +33,25 @@ type CompanyApproval struct {
 // AddCompanyApproval 新增客户产品
 func AddCompanyApproval(item *CompanyApproval) (lastId int, err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	var newId int64
-	newId, err = o.Insert(item)
+	newId, err = tx.Insert(item)
 	lastId = int(newId)
 	if err != nil {
 		return
 	}
 	sql := `UPDATE company_product SET approve_status=? WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, item.ApproveStatus, item.CompanyId, item.ProductId).Exec()
+	_, err = tx.Raw(sql, item.ApproveStatus, item.CompanyId, item.ProductId).Exec()
 	return
 }
 
@@ -178,32 +181,35 @@ func GetApprovalCount(condition string, pars []interface{}) (count int, err erro
 // TryOutToFormal 试用转正式
 func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
+	_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	sql = `UPDATE company SET type=1,last_updated_time=NOW() WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	items := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	_, err = tx.Raw(sql, companyId, productId).QueryRows(&items)
 	for _, pv := range items {
 		cpLog := new(company_permission_log.CompanyPermissionLog)
 		cpLog.CompanyId = companyId
@@ -219,14 +225,14 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 	}
 
 	sql = `DELETE FROM company_report_permission WHERE company_id=? AND product_id=?`
-	_, err = o.Raw(sql, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 
 	contractPermission := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_contract_permission WHERE company_contract_id=? AND company_id=? `
-	_, err = o.Raw(sql, companyContractId, companyId).QueryRows(&contractPermission)
+	_, err = tx.Raw(sql, companyContractId, companyId).QueryRows(&contractPermission)
 	if err != nil {
 		return
 	}
@@ -234,13 +240,13 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 		sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?) `
-		_, err = o.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式").Exec()
+		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式").Exec()
 		if err != nil {
 			return
 		}
 	}
 	sql = `UPDATE company_contract SET status=1 WHERE company_contract_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyContractId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyContractId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -250,12 +256,15 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 // FreezeToTryOut 冻结转试用
 func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUserId int, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	startDate := time.Now().Format(utils.FormatDate)
@@ -271,19 +280,19 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 	//6.9 fix 未续约强制弹窗要求客户冻结转试用后不弹床，取消清空冻结时间以标记曾经被冻结过
 	sql := `UPDATE company_product SET status='试用',approve_status='已审批',freeze_start_date=null,freeze_end_date=null,
             start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	//更新用户状态
 	sql = `UPDATE company SET type=2,last_updated_time=NOW() WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 	//更新审批单
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -291,7 +300,7 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 	//查询该用户所有产品权限，并把当前数据做日志（允许添加不修改的数据）
 	items := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	_, err = tx.Raw(sql, companyId, productId).QueryRows(&items)
 	for _, pv := range items {
 		cpLog := new(company_permission_log.CompanyPermissionLog)
 		cpLog.CompanyId = companyId
@@ -308,7 +317,7 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 
 	//更新产品（2021年03月02日14:58:50注释，调整为从申请权限表中获取数据并修改）
 	//sql = `UPDATE company_report_permission SET start_date=?,end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
-	//_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
+	//_, err = tx.Raw(sql, startDate, endDate, companyId, productId).Exec()
 	//if err != nil {
 	//	return
 	//}
@@ -317,7 +326,7 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 	count, _ := company_report_permission.GetCompanyReportPermissionCount(companyId, productId)
 	if count > 0 {
 		sql := ` DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
-		_, err = o.Raw(sql, companyId, productId).Exec()
+		_, err = tx.Raw(sql, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -332,7 +341,7 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 		sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,status) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?) `
-		_, err = o.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, v.EndDate, productId, productName, status).Exec()
+		_, err = tx.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, v.EndDate, productId, productName, status).Exec()
 		if err != nil {
 			return err
 		}
@@ -343,12 +352,15 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 // TryOutDelay 试用延期
 func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerName, endDate, productName string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	endDateTime, err := time.Parse(utils.FormatDate, endDate)
@@ -358,13 +370,13 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 	newEndDate := endDateTime.AddDate(0, 2, 0).Format(utils.FormatDate)
 	//更新用户产品状态
 	sql := `UPDATE company_product SET approve_status='已审批',end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, newEndDate, companyId, productId).Exec()
+	_, err = tx.Raw(sql, newEndDate, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	//更新审批单
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -372,7 +384,7 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 	//查询该用户所有产品权限，并把当前数据做日志（允许添加不修改的数据）
 	items := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	_, err = tx.Raw(sql, companyId, productId).QueryRows(&items)
 	for _, pv := range items {
 		cpLog := new(company_permission_log.CompanyPermissionLog)
 		cpLog.CompanyId = companyId
@@ -399,7 +411,7 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 		}
 		if isExist > 0 {
 			sql = `UPDATE company_report_permission SET end_date=?,status=?,modify_time=NOW() WHERE company_id=? AND product_id=? AND chart_permission_id=?`
-			_, err = o.Raw(sql, newEndDate, status, companyId, productId, v.ChartPermissionId).Exec()
+			_, err = tx.Raw(sql, newEndDate, status, companyId, productId, v.ChartPermissionId).Exec()
 			if err != nil {
 				return err
 			}
@@ -407,7 +419,7 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 			sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,status) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?) `
-			_, err = o.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, newEndDate, productId, productName, status).Exec()
+			_, err = tx.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, newEndDate, productId, productName, status).Exec()
 			if err != nil {
 				return err
 			}
@@ -419,12 +431,15 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 // ApplyReceive 原销售申请领取
 func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserId int, sysUserName, productName string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -437,28 +452,28 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 
 	//更新用户产品状态
 	sql := `UPDATE company_product SET status='试用',approve_status='已审批',try_out_time=NULL,last_description_time=NULL, start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 
 	//更新用户状态
 	sql = `UPDATE company SET type=2,last_updated_time=NOW() WHERE company_id=? `
-	_, err = o.Raw(sql, companyId).Exec()
+	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
 		return
 	}
 
 	//更新审批单
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	//查询该用户所有产品权限，并把当前数据做日志（允许添加不修改的数据）
 	items := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	_, err = tx.Raw(sql, companyId, productId).QueryRows(&items)
 	for _, pv := range items {
 		cpLog := new(company_permission_log.CompanyPermissionLog)
 		cpLog.CompanyId = companyId
@@ -475,7 +490,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 
 	//更新产品（2021年03月02日14:58:50注释，调整为从申请权限表中获取数据并修改）
 	//sql = `UPDATE company_report_permission SET start_date=?,end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
-	//_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
+	//_, err = tx.Raw(sql, startDate, endDate, companyId, productId).Exec()
 	//if err != nil {
 	//	return
 	//}
@@ -484,7 +499,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 	count, _ := company_report_permission.GetCompanyReportPermissionCount(companyId, productId)
 	if count > 0 {
 		sql := ` DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
-		_, err = o.Raw(sql, companyId, productId).Exec()
+		_, err = tx.Raw(sql, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -499,7 +514,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 		sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,status) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?) `
-		_, err = o.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, v.EndDate, productId, productName, status).Exec()
+		_, err = tx.Raw(sql, companyId, v.ChartPermissionId, v.ChartPermissionId, v.StartDate, v.EndDate, productId, productName, status).Exec()
 		if err != nil {
 			return err
 		}
@@ -510,19 +525,22 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 // ApplyServiceUpdate 申请服务更新
 func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
 	items := make([]*company_report_permission.CompanyReportPermission, 0)
 
 	sql := `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	_, err = tx.Raw(sql, companyId, productId).QueryRows(&items)
 	if err != nil {
 		return
 	}
@@ -580,26 +598,26 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 
 	//删除所有权限
 	//sql = `DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
-	//_, err = o.Raw(sql, companyId, productId).Exec()
+	//_, err = tx.Raw(sql, companyId, productId).Exec()
 	//if err != nil {
 	//	return
 	//}
 
 	//更新客户产品信息
 	sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
+	_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 
 	contractPermission := make([]*company_report_permission.CompanyReportPermission, 0)
 	sql = `SELECT * FROM company_contract_permission WHERE company_contract_id=? AND company_id=? `
-	_, err = o.Raw(sql, companyContractId, companyId).QueryRows(&contractPermission)
+	_, err = tx.Raw(sql, companyContractId, companyId).QueryRows(&contractPermission)
 	if err != nil {
 		return
 	}
@@ -633,7 +651,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 			//如果 需要更新 字段 为 true，那么就去更新
 			if needUpdate {
 				sql = `update company_report_permission set end_date=?,last_updated_time=now(),modify_time=now(),company_contract_id=?,status=? where company_report_permission_id=? `
-				_, tmpErr := o.Raw(sql, pv.EndDate, pv.CompanyContractId, "正式", nowPermission.CompanyReportPermissionId).Exec()
+				_, tmpErr := tx.Raw(sql, pv.EndDate, pv.CompanyContractId, "正式", nowPermission.CompanyReportPermissionId).Exec()
 				err = tmpErr
 				if err != nil {
 					return
@@ -644,7 +662,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 			sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
              chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status) 
 			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?) `
-			_, tmpErr := o.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式").Exec()
+			_, tmpErr := tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式").Exec()
 			err = tmpErr
 			if err != nil {
 				return
@@ -652,7 +670,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 		}
 	}
 	sql = `UPDATE company_contract SET status=1,modify_time=NOW() WHERE company_contract_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyContractId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyContractId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -663,12 +681,15 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 // ApproveRefuse 审批拒绝
 func ApproveRefuse(companyId, productId int, approveStatus, approveRemark string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	sql := `UPDATE  company_product
@@ -676,7 +697,7 @@ func ApproveRefuse(companyId, productId int, approveStatus, approveRemark string
 			  approve_status = '驳回',
 			  modify_time=NOW()
 			WHERE company_id = ? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -687,37 +708,40 @@ func ApproveRefuse(companyId, productId int, approveStatus, approveRemark string
 			  approve_time=NOW(),
 			  modify_time=NOW()
 			WHERE company_id = ? AND product_id=? AND approve_status='待审批' `
-	_, err = o.Raw(sql, approveRemark, companyId, productId).Exec()
+	_, err = tx.Raw(sql, approveRemark, companyId, productId).Exec()
 	return
 }
 
 // ApplyApproveContract 更新审批单、合同状态
 func ApplyApproveContract(companyId, productId, companyApprovalId, companyContractId int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	sql := `UPDATE company_product SET approve_status='已审批',modify_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 
 	//更新审批单
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyApprovalId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
 
 	//更新合同
 	sql = `UPDATE company_contract SET status=1,modify_time=NOW() WHERE company_contract_id=? AND company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyContractId, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyContractId, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -734,22 +758,24 @@ func GetCompanyApprovalDetailById(companyId, productId int) (item *CompanyApprov
 // ModifyCompanyApproval 修改申请信息
 func ModifyCompanyApproval(companyId, productId, companyApprovalId int, approveContent, applyReasons string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			utils.FileLog.Info("试用延期申请：Err %s", err.Error())
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	sql := `UPDATE company_approval SET approve_status = '待审批', approve_content=?,apply_reasons=?,modify_time=NOW() WHERE company_approval_id = ? `
-	_, err = o.Raw(sql, approveContent, applyReasons, companyApprovalId).Exec()
+	_, err = tx.Raw(sql, approveContent, applyReasons, companyApprovalId).Exec()
 	if err != nil {
 		return
 	}
 	sql = `UPDATE company_product SET approve_status='待审批' WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
+	_, err = tx.Raw(sql, companyId, productId).Exec()
 	utils.FileLog.Info("试用延期申请：Err %s,%s,%d", sql, companyId, productId)
 	return
 }

models/tables/company_approval_message/company_approval_message.go

@@ -1,7 +1,7 @@
 package company_approval_message
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_contract/company_contract.go

@@ -1,7 +1,7 @@
 package company_contract
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
 	"time"
 )

models/tables/company_delay_permission/company_delay_permission.go

@@ -1,7 +1,7 @@
 package company_delay_permission
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_log/company_log.go

@@ -1,7 +1,7 @@
 package company_log
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_operation_record/company_operation_record.go

@@ -1,7 +1,7 @@
 package company_operation_record
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_permission_log/company_permission_log.go

@@ -1,7 +1,7 @@
 package company_permission_log
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_product/company_product.go

@@ -1,7 +1,7 @@
 package company_product
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_product_log/company_product_log.go

@@ -1,7 +1,7 @@
 package company_product_log
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_product_update_log/company_product_update_log.go

@@ -1,7 +1,7 @@
 package company_product_update_log
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_report_permission/company_report_permission.go

@@ -1,7 +1,7 @@
 package company_report_permission
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/contract/contract.go

@@ -2,7 +2,7 @@ package contract
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/custom/contract"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
 	"hongze/hongze_mobile_admin/utils"
@@ -135,17 +135,20 @@ func GetContractDetailById(contractId int) (contractInfo *ContractDetail, err er
 //合同添加
 func AddContract(contractInfo *Contract, contractServiceAndDetailList []*contract.ContractServiceAndDetail) (newContract *Contract, err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
 	//合同数据入库
-	contractId, err := o.Insert(contractInfo)
+	contractId, err := tx.Insert(contractInfo)
 	if err != nil {
 		return
 	}
@@ -162,7 +165,7 @@ func AddContract(contractInfo *Contract, contractServiceAndDetailList []*contrac
 			HasDetail:         tmpContractService.HasDetail,
 			CreateTime:        time.Now(),
 		}
-		contractServiceId, serviceErr := o.Insert(contractService)
+		contractServiceId, serviceErr := tx.Insert(contractService)
 		if serviceErr != nil {
 			err = serviceErr
 			return
@@ -178,7 +181,7 @@ func AddContract(contractInfo *Contract, contractServiceAndDetailList []*contrac
 			contractServiceDetail.ServiceTemplateId = contractService.ServiceTemplateId
 
 			//合同服务详情入库
-			contractServiceDetailId, detailErr := o.Insert(contractServiceDetail)
+			contractServiceDetailId, detailErr := tx.Insert(contractServiceDetail)
 			if detailErr != nil {
 				err = detailErr
 				return
@@ -265,28 +268,31 @@ func GetContractList(condition string, pars []interface{}, startSize, pageSize i
 //修改合同
 func EditContract(contractInfo *Contract, contractServiceAndDetailList []*contract.ContractServiceAndDetail) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
 	contractId := contractInfo.ContractId
 	//合同数据入库
-	_, err = o.Update(contractInfo)
+	_, err = tx.Update(contractInfo)
 	if err != nil {
 		return
 	}
 
 	//删除合同的原始服务信息
 	sql := `delete from contract_service where contract_id = ?`
-	_, err = o.Raw(sql, contractId).Exec()
+	_, err = tx.Raw(sql, contractId).Exec()
 	//删除合同的原始服务详情信息
 	sql = `delete from contract_service_detail where contract_id = ?`
-	_, err = o.Raw(sql, contractId).Exec()
+	_, err = tx.Raw(sql, contractId).Exec()
 
 	for i := 0; i < len(contractServiceAndDetailList); i++ {
 		//合同服务数据入库
@@ -300,7 +306,7 @@ func EditContract(contractInfo *Contract, contractServiceAndDetailList []*contra
 			HasDetail:         tmpContractService.HasDetail,
 			CreateTime:        time.Now(),
 		}
-		contractServiceId, serviceErr := o.Insert(contractService)
+		contractServiceId, serviceErr := tx.Insert(contractService)
 		if serviceErr != nil {
 			err = serviceErr
 			return
@@ -316,7 +322,7 @@ func EditContract(contractInfo *Contract, contractServiceAndDetailList []*contra
 			contractServiceDetail.ServiceTemplateId = contractService.ServiceTemplateId
 
 			//合同服务详情入库
-			contractServiceDetailId, detailErr := o.Insert(contractServiceDetail)
+			contractServiceDetailId, detailErr := tx.Insert(contractServiceDetail)
 			if detailErr != nil {
 				err = detailErr
 				return
@@ -341,19 +347,22 @@ func AddContractPdf(contractId int, pdfUrl string) (err error) {
 //删除合同
 func DeleteContract(contractInfo *Contract) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
 	contractInfo.IsDelete = 1
 	contractInfo.ModifyTime = time.Now()
 	//合同数据入库
-	_, err = o.Update(contractInfo)
+	_, err = tx.Update(contractInfo)
 	if err != nil {
 		return
 	}
@@ -363,12 +372,15 @@ func DeleteContract(contractInfo *Contract) (err error) {
 //作废合同
 func InvalidContract(contractInfo *Contract) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -376,7 +388,7 @@ func InvalidContract(contractInfo *Contract) (err error) {
 	contractInfo.ModifyTime = time.Now()
 	contractInfo.InvalidTime = time.Now()
 	//合同数据入库
-	_, err = o.Update(contractInfo, "Status", "ModifyTime", "InvalidTime")
+	_, err = tx.Update(contractInfo, "Status", "ModifyTime", "InvalidTime")
 	if err != nil {
 		return
 	}

models/tables/contract_approval/contract_approval.go

@@ -1,7 +1,7 @@
 package contract_approval
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/utils"
@@ -284,16 +284,19 @@ func (ContractApproval) CheckPendingByContractId(contractId int, approvalType st
 //发起审批（工作流）
 func (ContractApproval) Apply(contractApprovalInfo *ContractApproval, contractApprovalRecordList []*contract_approval_record.ContractApprovalRecord) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	//审批单记录
-	ContractApprovalId, err := o.Insert(contractApprovalInfo)
+	ContractApprovalId, err := tx.Insert(contractApprovalInfo)
 	if err != nil {
 		return
 	}
@@ -303,7 +306,7 @@ func (ContractApproval) Apply(contractApprovalInfo *ContractApproval, contractAp
 	for _, contractApprovalRecord := range contractApprovalRecordList {
 		//审批流记录
 		contractApprovalRecord.ContractApprovalId = contractApprovalInfo.ContractApprovalId
-		contractApprovalRecordId, tmpErr := o.Insert(contractApprovalRecord)
+		contractApprovalRecordId, tmpErr := tx.Insert(contractApprovalRecord)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -316,11 +319,11 @@ func (ContractApproval) Apply(contractApprovalInfo *ContractApproval, contractAp
 	case "contract":
 		//修改合同状态为待审批
 		sql := `UPDATE contract SET status="待审批",modify_time=NOW() WHERE contract_id = ?`
-		_, err = o.Raw(sql, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, contractApprovalInfo.ContractId).Exec()
 	case "seal":
 		//修改用印状态为待审批
 		sql := `UPDATE seal SET status="待审批",modify_time=NOW() WHERE seal_id = ?`
-		_, err = o.Raw(sql, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, contractApprovalInfo.ContractId).Exec()
 	}
 	return
 }
@@ -328,18 +331,21 @@ func (ContractApproval) Apply(contractApprovalInfo *ContractApproval, contractAp
 //撤回审核单
 func (ContractApproval) Cancel(contractApprovalInfo *ContractApproval, contractApprovalRecordList []*contract_approval_record.ContractApprovalRecord) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	//变更审批单记录
 	contractApprovalInfo.Status = "已撤回"
 	contractApprovalInfo.ModifyTime = time.Now()
-	_, err = o.Update(contractApprovalInfo, "Status", "ModifyTime")
+	_, err = tx.Update(contractApprovalInfo, "Status", "ModifyTime")
 	if err != nil {
 		return
 	}
@@ -348,7 +354,7 @@ func (ContractApproval) Cancel(contractApprovalInfo *ContractApproval, contractA
 	for _, contractApprovalRecord := range contractApprovalRecordList {
 		contractApprovalRecord.Status = "已撤回"
 		contractApprovalRecord.ModifyTime = time.Now()
-		_, tmpErr := o.Update(contractApprovalRecord, "Status", "ModifyTime")
+		_, tmpErr := tx.Update(contractApprovalRecord, "Status", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -359,11 +365,11 @@ func (ContractApproval) Cancel(contractApprovalInfo *ContractApproval, contractA
 	case "contract":
 		//修改合同状态为已撤回
 		sql := `UPDATE contract SET status="已撤回",modify_time=NOW() WHERE contract_id = ?`
-		_, err = o.Raw(sql, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, contractApprovalInfo.ContractId).Exec()
 	case "seal":
 		//修改用印状态为已撤回
 		sql := `UPDATE seal SET status="已撤回",modify_time=NOW() WHERE seal_id = ?`
-		_, err = o.Raw(sql, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, contractApprovalInfo.ContractId).Exec()
 	}
 	return
 }
@@ -371,12 +377,15 @@ func (ContractApproval) Cancel(contractApprovalInfo *ContractApproval, contractA
 //审核驳回
 func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractApprovalRecord *contract_approval_record.ContractApprovalRecord, approveUserId int, approveUserName, remark string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 	//变更审批单记录
@@ -384,7 +393,7 @@ func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractA
 	contractApprovalInfo.ApproveRemark = remark //审核失败理由
 	contractApprovalInfo.ModifyTime = time.Now()
 	//contractApprovalInfo.CurrNodeId = 0 //当前节点变更为0，代表当前审批流程已经结束了
-	_, err = o.Update(contractApprovalInfo, "Status", "ApproveRemark", "ModifyTime")
+	_, err = tx.Update(contractApprovalInfo, "Status", "ApproveRemark", "ModifyTime")
 	if err != nil {
 		return
 	}
@@ -396,7 +405,7 @@ func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractA
 	contractApprovalRecord.ApproveUserName = approveUserName //审批人名称
 	contractApprovalRecord.ApproveTime = time.Now()          //审批人名称
 	contractApprovalRecord.ModifyTime = time.Now()
-	_, err = o.Update(contractApprovalRecord)
+	_, err = tx.Update(contractApprovalRecord)
 	if err != nil {
 		return
 	}
@@ -405,11 +414,11 @@ func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractA
 	case "contract":
 		//修改合同状态为已驳回
 		sql := `UPDATE contract SET status="已驳回",modify_content="",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE contract_id = ?`
-		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	case "seal":
 		//修改用印状态为已驳回
 		sql := `UPDATE seal SET status="已驳回",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE seal_id = ?`
-		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+		_, err = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	}
 	return
 }
@@ -424,12 +433,15 @@ type NextApproval struct {
 //审核通过
 func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contractApprovalRecord *contract_approval_record.ContractApprovalRecord, remark string) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -438,7 +450,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 	contractApprovalRecord.ApproveRemark = remark   //审核失败理由
 	contractApprovalRecord.ApproveTime = time.Now() //审批时间
 	contractApprovalRecord.ModifyTime = time.Now()
-	_, err = o.Update(contractApprovalRecord, "Status", "ApproveRemark", "ApproveTime", "ModifyTime")
+	_, err = tx.Update(contractApprovalRecord, "Status", "ApproveRemark", "ApproveTime", "ModifyTime")
 	if err != nil {
 		return
 	}
@@ -450,7 +462,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 		contractApprovalInfo.ApproveRemark = remark //审核理由
 		//contractApprovalInfo.CurrNodeId = contractApprovalRecord.NextNodeId //下级审批节点id
 		contractApprovalInfo.ModifyTime = time.Now()
-		_, tmpErr := o.Update(contractApprovalInfo, "Status", "ApproveRemark", "ModifyTime")
+		_, tmpErr := tx.Update(contractApprovalInfo, "Status", "ApproveRemark", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -460,7 +472,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 		case "contract":
 			//修改合同状态为已审批
 			sql := `UPDATE contract SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE contract_id = ?`
-			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+			_, tmpErr = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -468,7 +480,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 		case "seal":
 			//修改用印状态为已审批
 			sql := `UPDATE seal SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE seal_id = ?`
-			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+			_, tmpErr = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -479,7 +491,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 		contractApprovalInfo.ApproveRemark = remark                         //审核理由
 		contractApprovalInfo.CurrNodeId = contractApprovalRecord.NextNodeId //下级审批节点id
 		contractApprovalInfo.ModifyTime = time.Now()
-		_, tmpErr := o.Update(contractApprovalInfo, "ApproveRemark", "CurrNodeId", "ModifyTime")
+		_, tmpErr := tx.Update(contractApprovalInfo, "ApproveRemark", "CurrNodeId", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -492,12 +504,15 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 //抄送
 func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, contractApprovalRecordList []*contract_approval_record.ContractApprovalRecord, remark string, nextNodeId int) (err error) {
 	o := orm.NewOrm()
-	o.Begin()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
 	defer func() {
 		if err != nil {
-			o.Rollback()
+			_ = tx.Rollback()
 		} else {
-			o.Commit()
+			_ = tx.Commit()
 		}
 	}()
 
@@ -506,7 +521,7 @@ func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, con
 		contractApprovalRecord.Status = "已审批"
 		contractApprovalRecord.ApproveTime = time.Now() //审批时间
 		contractApprovalRecord.ModifyTime = time.Now()
-		_, err = o.Update(contractApprovalRecord, "Status", "ApproveTime", "ModifyTime")
+		_, err = tx.Update(contractApprovalRecord, "Status", "ApproveTime", "ModifyTime")
 		if err != nil {
 			return
 		}
@@ -522,7 +537,7 @@ func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, con
 		contractApprovalInfo.Status = "已审批"
 		//contractApprovalInfo.CurrNodeId = nextNodeId //下级审批节点id
 		contractApprovalInfo.ModifyTime = time.Now()
-		_, tmpErr := o.Update(contractApprovalInfo, "Status", "ModifyTime")
+		_, tmpErr := tx.Update(contractApprovalInfo, "Status", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -532,7 +547,7 @@ func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, con
 		case "contract":
 			//修改合同状态为已审批
 			sql := `UPDATE contract SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE contract_id = ?`
-			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+			_, tmpErr = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -540,7 +555,7 @@ func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, con
 		case "seal":
 			//修改用印状态为已审批
 			sql := `UPDATE seal SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE seal_id = ?`
-			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
+			_, tmpErr = tx.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -550,7 +565,7 @@ func (ContractApproval) ApprovedByCc(contractApprovalInfo *ContractApproval, con
 		//变更审批单记录
 		contractApprovalInfo.CurrNodeId = nextNodeId //下级审批节点id
 		contractApprovalInfo.ModifyTime = time.Now()
-		_, tmpErr := o.Update(contractApprovalInfo, "CurrNodeId", "ModifyTime")
+		_, tmpErr := tx.Update(contractApprovalInfo, "CurrNodeId", "ModifyTime")
 		if tmpErr != nil {
 			err = tmpErr
 			return

models/tables/contract_approval_record/contract_approval_record.go

@@ -1,7 +1,7 @@
 package contract_approval_record
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/contract_operation_record/contract_operation_record.go

@@ -1,7 +1,7 @@
 package contract_operation_record
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/contract_relation/contract_relation.go

@@ -1,7 +1,7 @@
 package contract_relation
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/custom/contract"
 )
 

models/tables/contract_service_detail/contract_service_detail.go

@@ -1,7 +1,7 @@
 package contract_service_detail
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/contract_service_template/contract_service_template.go

@@ -1,7 +1,7 @@
 package contract_service_template
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
 	"time"
 )

models/tables/contract_template/contract_template.go

@@ -1,7 +1,7 @@
 package contract_template
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/h5_admin_session/h5_admin_session.go

@@ -1,7 +1,7 @@
 package h5_admin_session
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/report/report.go

@@ -1,7 +1,7 @@
 package report
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -63,8 +63,6 @@ type ReportListResp struct {
 }
 
 func GetReportListCount(condition string, pars []interface{}, companyType string) (count int, err error) {
-	o := orm.NewOrm()
-
 	//产品权限
 	companyTypeSqlStr := ``
 	if companyType == "ficc" {
@@ -73,7 +71,7 @@ func GetReportListCount(condition string, pars []interface{}, companyType string
 		companyTypeSqlStr = " AND classify_id_first = 40 "
 	}
 
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM report WHERE 1=1 ` + companyTypeSqlStr
 	if condition != "" {
 		sql += condition
@@ -83,8 +81,7 @@ func GetReportListCount(condition string, pars []interface{}, companyType string
 }
 
 func GetReportList(condition string, pars []interface{}, companyType string, startSize, pageSize int) (items []*ReportList, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	//产品权限
 	companyTypeSqlStr := ``
 	if companyType == "ficc" {
@@ -107,8 +104,7 @@ func GetReportList(condition string, pars []interface{}, companyType string, sta
 
 //发布报告
 func PublishReport(reportIds string) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET state=2,publish_time=now(),modify_time=NOW() WHERE id IN (` + reportIds + `)`
 	_, err = o.Raw(sql).Exec()
 	return
@@ -116,8 +112,7 @@ func PublishReport(reportIds string) (err error) {
 
 //取消发布报告
 func PublishCancleReport(reportIds int) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE report SET state=1,publish_time=null WHERE id =?  `
 	_, err = o.Raw(sql, reportIds).Exec()
 	return
@@ -125,8 +120,7 @@ func PublishCancleReport(reportIds int) (err error) {
 
 //删除报告
 func DeleteReport(reportIds int) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM report WHERE id =? `
 	_, err = o.Raw(sql, reportIds).Exec()
 	return
@@ -157,16 +151,14 @@ type ReportDetail struct {
 }
 
 func GetReportById(reportId int) (item *ReportDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report WHERE id=?`
 	err = o.Raw(sql, reportId).QueryRow(&item)
 	return
 }
 
 func GetReportStage(classifyIdFirst, classifyIdSecond int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
 		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_second=? "
@@ -179,8 +171,7 @@ func GetReportStage(classifyIdFirst, classifyIdSecond int) (count int, err error
 }
 
 func GetReportStageEdit(classifyIdFirst, classifyIdSecond, reportId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
 		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_second=? AND id<>? "
@@ -225,8 +216,7 @@ type AddResp struct {
 }
 
 func AddReport(item *Report) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -252,8 +242,7 @@ type EditResp struct {
 }
 
 func EditReport(item *Report, reportId int64) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report
 			SET
 			  classify_id_first =?,
@@ -285,8 +274,7 @@ type ClassifyIdDetailReq struct {
 }
 
 func GetReportDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *Report, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report WHERE 1=1 `
 	if classifyIdSecond > 0 {
 		sql = sql + ` AND classify_id_second=?   ORDER BY stage DESC LIMIT 1`
@@ -303,8 +291,7 @@ type SendTemplateMsgReq struct {
 }
 
 func ModifyReportMsgIsSend(reportId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	report, err := GetReportById(reportId)
 	if err != nil {
 		return
@@ -317,8 +304,7 @@ func ModifyReportMsgIsSend(reportId int) (err error) {
 }
 
 func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? `
 	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
 	return
@@ -349,8 +335,7 @@ type ReportItem struct {
 }
 
 func GetReportItemById(reportId int) (item *ReportItem, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report WHERE id=?`
 	err = o.Raw(sql, reportId).QueryRow(&item)
 	return
@@ -362,16 +347,14 @@ type SaveReportContent struct {
 }
 
 func EditReportContent(reportId int, content, contentSub string) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE report SET content=?,content_sub=?,modify_time=NOW() WHERE id=? `
 	_, err = o.Raw(sql, content, contentSub, reportId).Exec()
 	return
 }
 
 func AddReportSaveLog(reportId int, content, contentSub string) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` INSERT INTO report_save_log(report_id, content,content_sub) VALUES (?,?,?) `
 	_, err = o.Raw(sql, reportId, content, contentSub).Exec()
 	return
@@ -382,8 +365,7 @@ type SaveReportContentResp struct {
 }
 
 func ModifyReportCode(reportId int64, reportCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET report_code=? WHERE id=? `
 	_, err = o.Raw(sql, reportCode, reportId).Exec()
 	return

models/tables/resource/resource.go

@@ -1,7 +1,7 @@
 package resource
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -13,15 +13,13 @@ type Resource struct {
 }
 
 func AddResource(item *Resource) (newId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	newId, err = o.Insert(item)
 	return
 }
 
 func GetResourceById(id string) (item *Resource, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := "SELECT * FROM resource WHERE id=? "
 	err = o.Raw(sql, id).QueryRow(&item)
 	return

models/tables/seal/seal.go

@@ -2,7 +2,7 @@ package seal
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
 )

models/tables/seal/seal_operation_record.go

@@ -1,7 +1,7 @@
 package seal
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/wx_token/wx_token.go

@@ -1,6 +1,6 @@
 package wx_token
 
-import "github.com/rdlucklib/rdluck_tools/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type WxToken struct {
 	AccessToken string

models/tables/wx_user/wx_user.go

@@ -1,7 +1,7 @@
 package wx_user
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/user_view_history.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
 )

models/wechat_send_msg.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 )
 
 type OpenIdList struct {
@@ -16,4 +16,4 @@ func GetAdminOpenIdByMobile(mobile string) (items []*OpenIdList, err error) {
           WHERE ur.open_id != "" and ur.create_platform=1 AND wu.mobile=? `
 	_, err = orm.NewOrm().Raw(sql, mobile).QueryRows(&items)
 	return
-}
+}

services/contract/contract.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/custom"
 	contractCustom "hongze/hongze_mobile_admin/models/custom/contract"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"

utils/logs.go

@@ -1,12 +1,57 @@
 package utils
 
 import (
+	"encoding/json"
 	"github.com/beego/beego/v2/adapter/logs"
+	"os"
 )
 
 var FileLog *logs.BeeLogger
+var Binlog *logs.BeeLogger
 
 func init() {
 	FileLog = logs.NewLogger(1000000)
 	FileLog.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/hongze_mobile_admin.log"}`)
+
+	//初始化binlog日志
+	initBinlog()
+}
+
+func initBinlog() {
+	//binlog日志
+	binLogDir := `./binlog`
+	os.MkdirAll(binLogDir, os.ModePerm)
+	Binlog = logs.NewLogger(1000000)
+	logConfig := getDefaultLogConfig()
+	logConfig.FileName = "./binlog/binlog.log"
+	logConfig.MaxLines = 10000000
+	logConfig.Rotate = true
+	b, _ := json.Marshal(logConfig)
+	Binlog.SetLogger(logs.AdapterFile, string(b))
+	Binlog.EnableFuncCallDepth(true)
+}
+
+type logConfig struct {
+	FileName string `json:"filename" description:"保存的文件名"`
+	MaxLines int    `json:"maxlines"  description:"每个文件保存的最大行数，默认值 1000000"`
+	MaxSize  int    `json:"maxsize" description:"每个文件保存的最大尺寸，默认值是 1 << 28, //256 MB"`
+	Daily    bool   `json:"daily" description:"是否按照每天 logrotate，默认是 true"`
+	MaxDays  int    `json:"maxdays" description:"文件最多保存多少天，默认保存 7 天"`
+	Rotate   bool   `json:"rotate" description:"是否开启 logrotate，默认是 true"`
+	Level    int    `json:"level" description:"日志保存的时候的级别，默认是 Trace 级别"`
+	Color    bool   `json:"color" description:"日志是否输出颜色"`
+	//Perm     string `json:"perm" description:"日志文件权限"`
+}
+
+func getDefaultLogConfig() logConfig {
+	return logConfig{
+		FileName: "",
+		MaxLines: 0,
+		MaxSize:  1 << 28,
+		Daily:    true,
+		MaxDays:  31, //我就是喜欢31天，咋滴，不喜欢你就自己改-_-!
+		Rotate:   true,
+		Level:    logs.LevelTrace,
+		//Perm:     "",
+	}
 }