From 852837568b948ea385bf7d3f1894ac45e9eecbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E6=88=90?= Date: Tue, 10 Oct 2023 10:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8D=A1=E5=B8=A6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/order.go | 2 ++ config/settings.yml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/admin/models/order.go b/app/admin/models/order.go index 624ed1a..44578d1 100644 --- a/app/admin/models/order.go +++ b/app/admin/models/order.go @@ -123,6 +123,7 @@ type OrderCard struct { RevertShopperCode string `json:"revert_shopper_code"` //收货识别码 DeliverShopper *ShopperPromotionCode `json:"deliver_shopper" gorm:"foreignKey:deliver_shopper_code;references:code"` //发货店员 RevertShopper *ShopperPromotionCode `json:"revert_shopper" gorm:"foreignKey:revert_shopper_code;references:code"` //收货店员 + GameCard *GameCard `json:"game_card" gorm:"foreignKey:game_card_id;references:id"` //卡带信息 } func (*OrderCard) TableName() string { @@ -1479,6 +1480,7 @@ func GetUserExpiredCards(userId []uint32) (map[uint32][]OrderCard, error) { var oc []OrderCard err := orm.Eloquent.Table("order_card"). + Preload("GameCard"). Where("uid in (?)", userId). Where("pay_status = ?", 2).Where("card_status in ?", []int{1, 2, 3}). Find(&oc).Error diff --git a/config/settings.yml b/config/settings.yml index 21a38b1..31760a9 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -32,16 +32,16 @@ settings: enabledjob: false jwt: # token 密钥，生产环境时及的修改 - secret: go-admin -# secret: adminqYrhCcQRvVNAaEo4h4osoW +# secret: go-admin + secret: adminqYrhCcQRvVNAaEo4h4osoW # token 过期时间 单位：秒 timeout: 3600 database: # 数据库类型 mysql，sqlite3， postgres driver: mysql # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms - source: mh_dev:m5h4parZsXjbeiFh@tcp(39.108.188.218:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms -# source: mh_pro:fLeytnBFCRB553ab@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms +# source: mh_dev:m5h4parZsXjbeiFh@tcp(39.108.188.218:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms + source: mh_pro:fLeytnBFCRB553ab@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms gen: # 代码生成读取的数据库名称