From 10ca8371ece3ea79297dab05d486ae112da7b46a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 11:04:51 +0800
Subject: [PATCH] fix
---
model/subOrder.go | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index 8ba75c8..16d2b82 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -7,13 +7,15 @@
type (
SubOrder struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
- Client Client `json:"client" gorm:"foreignKey:ClientId"`
- MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
- Products []Product `json:"products" gorm:"many2many:subOrder_product;"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
+ MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
+ MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
+ MasterOrder MasterOrder `json:"masterOrder" gorm:"foreignKey:MasterOrderId"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
+ Products []Product `json:"products" gorm:"many2many:subOrder_product;"`
gorm.Model `json:"-"`
}
@@ -107,7 +109,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
+ err := db.Preload("MasterOrder").Preload("Member").Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
return records, total, err
}
--
Gitblit v1.8.0