From 31ba7bfe14e6e75fd1abea42651b273349ea56de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 22 Jul 2022 17:16:33 +0800
Subject: [PATCH] 1

---
 business/model/print.go    |  1 +
 globals/beegodb/beegodb.go | 78 +++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/business/model/print.go b/business/model/print.go
index 01ad8e5c1..9b70aa19b 100644
--- a/business/model/print.go
+++ b/business/model/print.go
@@ -25,4 +25,5 @@ type Printer struct {
 	Volume       int    `json:"volume"`                      //音量，1-5 ，对应打印机2-10
 	FlowFlag     int    `json:"flowFlag"`                    //是否超流量了，1表示超了
 	OfflineCount int    `json:"offlineCount"`                //掉线次数
+	UserId       string `json:"user_id" db:"user_id"`        //打印机所属用户
 }
diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index 062889dde..096b3d15d 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -11,47 +11,47 @@ func Init() {
 	// set default database
 	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"))
 	//orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
-	//if beego.BConfig.RunMode == "rsm" {
-	//用户
-	orm.RegisterModel(&model.AuthBind{}, &model.User{})
-	orm.RegisterModel(&model.UserMember{})
-	orm.RegisterModel(&model.UserDeliveryAddress{})
-	orm.RegisterModel(&model.UserCityManager{})
-	orm.RegisterModel(&model.UserSearch{})
-	orm.RegisterModel(&model.UserUnionBind{})    //联盟相关绑定
-	orm.RegisterModel(&model.UserUnionBindImg{}) //多个活动图片
-	//账单
-	orm.RegisterModel(&model.UserBill{})
-	orm.RegisterModel(&model.BillIncome{})
-	orm.RegisterModel(&model.BillExpend{})
+	if beego.BConfig.RunMode == "rsm" {
+		//用户
+		orm.RegisterModel(&model.AuthBind{}, &model.User{})
+		orm.RegisterModel(&model.UserMember{})
+		orm.RegisterModel(&model.UserDeliveryAddress{})
+		orm.RegisterModel(&model.UserCityManager{})
+		orm.RegisterModel(&model.UserSearch{})
+		orm.RegisterModel(&model.UserUnionBind{})    //联盟相关绑定
+		orm.RegisterModel(&model.UserUnionBindImg{}) //多个活动图片
+		//账单
+		orm.RegisterModel(&model.UserBill{})
+		orm.RegisterModel(&model.BillIncome{})
+		orm.RegisterModel(&model.BillExpend{})
 
-	//支付订单
-	orm.RegisterModel(&model.Order{})
-	orm.RegisterModel(&model.DeliveryOrder{})
-	//联盟订单
-	orm.RegisterModel(&model.UnionOrder{})
-	orm.RegisterModel(&model.UnionOrderStatus{})
-	orm.RegisterModel(&model.UnionOrderSettle{}) //订单结算
-	//任务
-	orm.RegisterModel(&model.Job{}, &model.JobCategory{}, &model.JobStep{}, &model.JobImg{})
-	orm.RegisterModel(&model.JobOrder{})
-	orm.RegisterModel(&model.JobTimer{})
-	orm.RegisterModel(&model.JobSpan{})
-	//聊天
-	orm.RegisterModel(&model.ImMessageRecord{}, &model.MessageGroup{}, &model.MessageGroupMember{})
-	orm.RegisterModel(&model.MessageGroupRead{})
+		//支付订单
+		orm.RegisterModel(&model.Order{})
+		orm.RegisterModel(&model.DeliveryOrder{})
+		//联盟订单
+		orm.RegisterModel(&model.UnionOrder{})
+		orm.RegisterModel(&model.UnionOrderStatus{})
+		orm.RegisterModel(&model.UnionOrderSettle{}) //订单结算
+		//任务
+		orm.RegisterModel(&model.Job{}, &model.JobCategory{}, &model.JobStep{}, &model.JobImg{})
+		orm.RegisterModel(&model.JobOrder{})
+		orm.RegisterModel(&model.JobTimer{})
+		orm.RegisterModel(&model.JobSpan{})
+		//聊天
+		orm.RegisterModel(&model.ImMessageRecord{}, &model.MessageGroup{}, &model.MessageGroupMember{})
+		orm.RegisterModel(&model.MessageGroupRead{})
 
-	orm.RegisterModel(&model.Place{}, &model.StationInfo{})
-	orm.RegisterModel(&model.OperateEventDetail{})
-	orm.RegisterModel(&model.MtMember{})
-	orm.RegisterModel(&model.OperateEvent{})
-	orm.RegisterModel(&model.NewConfig{}, &legacymodel.Config{})
-	orm.RegisterModel(&model.AddressDistinguish{})
-	orm.RegisterModel(&model.VendorMatterCategory{}) //平台物流分类（手动添的）
-	orm.RegisterModel(&model.OrderPayRefund{})       // 退款表
-	orm.RegisterModel(&model.UserVendorOrder{})      // 物流订单
-	orm.RegisterModel(&model.WithdrawalRecord{})     // 提现申请
-	//}
+		orm.RegisterModel(&model.Place{}, &model.StationInfo{})
+		orm.RegisterModel(&model.OperateEventDetail{})
+		orm.RegisterModel(&model.MtMember{})
+		orm.RegisterModel(&model.OperateEvent{})
+		orm.RegisterModel(&model.NewConfig{}, &legacymodel.Config{})
+		orm.RegisterModel(&model.AddressDistinguish{})
+		orm.RegisterModel(&model.VendorMatterCategory{}) //平台物流分类（手动添的）
+		orm.RegisterModel(&model.OrderPayRefund{})       // 退款表
+		orm.RegisterModel(&model.UserVendorOrder{})      // 物流订单
+		orm.RegisterModel(&model.WithdrawalRecord{})     // 提现申请
+	}
 
 	//打印机
 	orm.RegisterModel(&model.PrintMsg{})