From 51c1904dec60bc7bfc92c30ceb9ab3d4756ce462 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 20 七月 2023 16:41:29 +0800
Subject: [PATCH] fix
---
model/salesDetails.go | 3 ++-
model/subOrder.go | 3 ++-
model/masterOrder.go | 3 ++-
model/orderManage.go | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/model/masterOrder.go b/model/masterOrder.go
index bd0a02c..6d52417 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -12,6 +12,7 @@
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞�诲崟鍙�"`
ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
StartTime time.Time `json:"start_time" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
EndTime time.Time `json:"end_time" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
@@ -70,7 +71,7 @@
func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, error) {
var db = slf.build()
var records = make([]*MasterOrder, 0)
- err := db.Find(&records).Error
+ err := db.Preload("Client").Find(&records).Error
return records, err
}
diff --git a/model/orderManage.go b/model/orderManage.go
index fd9626f..3bb6f81 100644
--- a/model/orderManage.go
+++ b/model/orderManage.go
@@ -10,6 +10,7 @@
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
Name string `json:"name" gorm:"column:name;type:varchar(255);comment:鍚堝悓鍚嶇О"`
ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
OrderType int `json:"orderType" gorm:"column:order_type;type:int;comment:宸ュ崟绫诲瀷"`
@@ -70,7 +71,7 @@
func (slf *OrderManageSearch) FindAll() ([]*OrderManage, error) {
var db = slf.build()
var record = make([]*OrderManage, 0)
- err := db.Find(&record).Error
+ err := db.Preload("Client").Find(&record).Error
return record, err
}
diff --git a/model/salesDetails.go b/model/salesDetails.go
index 57ebed0..d2c4ee9 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -10,6 +10,7 @@
SalesDetails 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"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
SaleChanceId int `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"`
SaleType int `json:"saleType" gorm:"column:sale_type;type:int;comment:閿�鍞被鍨�"`
@@ -81,6 +82,6 @@
func (slf *SalesDetailsSearch) FindAll() ([]*SalesDetails, error) {
var db = slf.build()
var records = make([]*SalesDetails, 0)
- err := db.Preload("Products").Find(&records).Error
+ err := db.Preload("Products").Preload("Client").Find(&records).Error
return records, err
}
diff --git a/model/subOrder.go b/model/subOrder.go
index b1f3479..60eb98c 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -9,6 +9,7 @@
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:閿�鍞瓙鍗曞彿"`
@@ -64,7 +65,7 @@
func (slf *SubOrderSearch) FindAll() (result []*SubOrder, err error) {
var db = slf.build()
- err = db.Preload("Products").Find(&result).Error
+ err = db.Preload("Products").Preload("Client").Find(&result).Error
return
}
--
Gitblit v1.8.0