From c3c48559884da39a98a87191806dead5d379ac76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 7 Dec 2022 13:48:19 +0800 Subject: [PATCH] 1 --- model/app_model/print_notice.go | 2 +- services/print_server/app_server/print_bill.go | 6 ++++-- services/print_server/app_server/wx_login.go | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/model/app_model/print_notice.go b/model/app_model/print_notice.go index de662cd..5624c11 100644 --- a/model/app_model/print_notice.go +++ b/model/app_model/print_notice.go @@ -8,7 +8,7 @@ type PrintNotice struct { CreatedAt time.Time `orm:"type(datetime)" json:"created_at" db:"created_at"` // 创建时间 UpdatedAt time.Time `orm:"type(datetime)" json:"updated_at" db:"updated_at"` // 更新时间 NoticeType int `orm:"type(int)" json:"notice_type" db:"notice_type"` // 类型(1-广告/2-通知/3帮助) - Msg string `orm:"type(varchar);size(255)" json:"msg" db:"msg"` // 内容(广告就是图片,通知消息就是文字) + Msg string `orm:"type(text)" json:"msg" db:"msg"` // 内容(广告就是图片,通知消息就是文字) Link string `orm:"type(varchar);size(255)" json:"link" db:"link"` // 跳转地址 } diff --git a/services/print_server/app_server/print_bill.go b/services/print_server/app_server/print_bill.go index f235fd2..3b0b43c 100644 --- a/services/print_server/app_server/print_bill.go +++ b/services/print_server/app_server/print_bill.go @@ -20,16 +20,18 @@ func (p *PrintBill) InitPPrintBill(tx *sqlx.Tx, bill *app_model.PrintBill) error return err } - // 无打印机账户信息,初始化打印机账户 if len(result) == 0 { + // 无打印机账户信息,初始化打印机账户 if err := dao.InitPrintBill(tx, bill); err != nil { return err } - } else if len(result) == 1 && result[0].UserId == "system" { + } else if len(result) == 1 /*&& result[0].UserId == "system"*/ { + // 有打印机账户属于系统 if err := dao.UpdateBillToUser(tx, bill); err != nil { return err } } else { + // 当前情况是打印机被删除过,重新添加 return fmt.Errorf("打印机账户余额数据不唯一,联系管理员") } diff --git a/services/print_server/app_server/wx_login.go b/services/print_server/app_server/wx_login.go index b19a2d4..267104e 100644 --- a/services/print_server/app_server/wx_login.go +++ b/services/print_server/app_server/wx_login.go @@ -214,7 +214,6 @@ func (u *UserLogin) GetJxc4Token() (string, error) { } jxc4User := &model.CallBack{} - fmt.Println("=============", string(bodyResp)) if err := json.Unmarshal(bodyResp, jxc4User); err != nil { return "", err }