minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

返回卡带信息

Browse Source
This commit is contained in:
范俊成 2023-10-10 10:31:43 +08:00
parent 2ef3469538
commit 852837568b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/models/order.go
View File

@ -123,6 +123,7 @@ type OrderCard struct {
RevertShopperCode string `json:"revert_shopper_code"` //收货识别码 RevertShopperCode string `json:"revert_shopper_code"` //收货识别码
DeliverShopper *ShopperPromotionCode `json:"deliver_shopper" gorm:"foreignKey:deliver_shopper_code;references: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"` //收货店员 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 { func (*OrderCard) TableName() string {
@ -1479,6 +1480,7 @@ func GetUserExpiredCards(userId []uint32) (map[uint32][]OrderCard, error) {
var oc []OrderCard var oc []OrderCard
err := orm.Eloquent.Table("order_card"). err := orm.Eloquent.Table("order_card").
Preload("GameCard").
Where("uid in (?)", userId). Where("uid in (?)", userId).
Where("pay_status = ?", 2).Where("card_status in ?", []int{1, 2, 3}). Where("pay_status = ?", 2).Where("card_status in ?", []int{1, 2, 3}).
Find(&oc).Error Find(&oc).Error

8
config/settings.yml
View File

@ -32,16 +32,16 @@ settings:
enabledjob: false enabledjob: false
jwt: jwt:
# token 密钥，生产环境时及的修改 # token 密钥，生产环境时及的修改
secret: go-admin # secret: go-admin
# secret: adminqYrhCcQRvVNAaEo4h4osoW secret: adminqYrhCcQRvVNAaEo4h4osoW
# token 过期时间 单位：秒 # token 过期时间 单位：秒
timeout: 3600 timeout: 3600
database: database:
# 数据库类型 mysql，sqlite3， postgres # 数据库类型 mysql，sqlite3， postgres
driver: mysql driver: mysql
# 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms # 数据库连接字符串 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_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_pro:fLeytnBFCRB553ab@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
gen: gen:
# 代码生成读取的数据库名称 # 代码生成读取的数据库名称