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/salesReturn.go | 2 model/salesLeads.go | 2 model/contract.go | 4 model/salesRefund.go | 2 model/quotation.go | 32 ++++--- model/subOrder.go | 18 ++-- docs/swagger.yaml | 24 ++++++ model/contact.go | 3 docs/docs.go | 36 +++++++++ docs/swagger.json | 36 +++++++++ model/masterOrder.go | 7 - model/followRecord.go | 41 +++++---- 12 files changed, 155 insertions(+), 52 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 9e8a1ad..0a86965 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -10775,6 +10775,9 @@ "is_first": { "type": "boolean" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -10849,6 +10852,9 @@ "is_first": { "type": "boolean" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -10888,6 +10894,9 @@ "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25", "type": "string" }, + "client": { + "$ref": "#/definitions/model.Client" + }, "clientId": { "type": "integer" }, @@ -10901,6 +10910,9 @@ "id": { "description": "The ID of the item\nexample: 1", "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "memberId": { "type": "integer" @@ -11026,6 +11038,9 @@ "client_id": { "type": "integer" }, + "client_status": { + "$ref": "#/definitions/model.ClientStatus" + }, "client_status_id": { "type": "integer" }, @@ -11065,8 +11080,14 @@ "record": { "type": "string" }, + "sale_chance": { + "$ref": "#/definitions/model.SaleChance" + }, "sale_chance_id": { "type": "integer" + }, + "sales_leads": { + "$ref": "#/definitions/model.SalesLeads" }, "sales_leads_id": { "type": "integer" @@ -11223,6 +11244,9 @@ }, "id": { "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "member_id": { "type": "integer" @@ -11455,6 +11479,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -11466,6 +11493,9 @@ "items": { "$ref": "#/definitions/model.Product" } + }, + "quotation_status": { + "$ref": "#/definitions/model.QuotationStatus" }, "quotation_status_id": { "type": "integer" @@ -12660,9 +12690,15 @@ "id": { "type": "integer" }, + "masterOrder": { + "$ref": "#/definitions/model.MasterOrder" + }, "masterOrderId": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "memberId": { "type": "integer" }, diff --git a/docs/swagger.json b/docs/swagger.json index 85e27d3..b3c429f 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -10763,6 +10763,9 @@ "is_first": { "type": "boolean" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -10837,6 +10840,9 @@ "is_first": { "type": "boolean" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -10876,6 +10882,9 @@ "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25", "type": "string" }, + "client": { + "$ref": "#/definitions/model.Client" + }, "clientId": { "type": "integer" }, @@ -10889,6 +10898,9 @@ "id": { "description": "The ID of the item\nexample: 1", "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "memberId": { "type": "integer" @@ -11014,6 +11026,9 @@ "client_id": { "type": "integer" }, + "client_status": { + "$ref": "#/definitions/model.ClientStatus" + }, "client_status_id": { "type": "integer" }, @@ -11053,8 +11068,14 @@ "record": { "type": "string" }, + "sale_chance": { + "$ref": "#/definitions/model.SaleChance" + }, "sale_chance_id": { "type": "integer" + }, + "sales_leads": { + "$ref": "#/definitions/model.SalesLeads" }, "sales_leads_id": { "type": "integer" @@ -11211,6 +11232,9 @@ }, "id": { "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "member_id": { "type": "integer" @@ -11443,6 +11467,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -11454,6 +11481,9 @@ "items": { "$ref": "#/definitions/model.Product" } + }, + "quotation_status": { + "$ref": "#/definitions/model.QuotationStatus" }, "quotation_status_id": { "type": "integer" @@ -12648,9 +12678,15 @@ "id": { "type": "integer" }, + "masterOrder": { + "$ref": "#/definitions/model.MasterOrder" + }, "masterOrderId": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "memberId": { "type": "integer" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index db44e48..5514aac 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -585,6 +585,8 @@ type: integer is_first: type: boolean + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -634,6 +636,8 @@ type: integer is_first: type: boolean + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -662,6 +666,8 @@ The date when the item was deleted example: 2023-08-10 15:48:25 type: string + client: + $ref: '#/definitions/model.Client' clientId: type: integer created_at: @@ -676,6 +682,8 @@ The ID of the item example: 1 type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: @@ -758,6 +766,8 @@ $ref: '#/definitions/model.Client' client_id: type: integer + client_status: + $ref: '#/definitions/model.ClientStatus' client_status_id: type: integer contact: @@ -784,8 +794,12 @@ type: string record: type: string + sale_chance: + $ref: '#/definitions/model.SaleChance' sale_chance_id: type: integer + sales_leads: + $ref: '#/definitions/model.SalesLeads' sales_leads_id: type: integer topic: @@ -890,6 +904,8 @@ type: string id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer money: @@ -1041,6 +1057,8 @@ type: string id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer number: @@ -1049,6 +1067,8 @@ items: $ref: '#/definitions/model.Product' type: array + quotation_status: + $ref: '#/definitions/model.QuotationStatus' quotation_status_id: type: integer sale_chance: @@ -1849,8 +1869,12 @@ type: integer id: type: integer + masterOrder: + $ref: '#/definitions/model.MasterOrder' masterOrderId: type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: diff --git a/model/contact.go b/model/contact.go index d1b838f..596ecf7 100644 --- a/model/contact.go +++ b/model/contact.go @@ -15,6 +15,7 @@ Position string `json:"position" gorm:"column:position;type:varchar(255);comment:鑱屼綅"` Phone string `json:"phone" gorm:"column:phone;type:varchar(255);comment:鐢佃瘽"` MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:璐熻矗浜篒D"` + Member User `json:"member" gorm:"foreignKey:MemberId"` IsFirst bool `json:"is_first" gorm:"column:is_first;type:tinyint(1);comment:鏄惁棣栬鑱旂郴浜�"` Wechat string `json:"wechat" gorm:"column:wechat;type:varchar(255);comment:寰俊"` Birthday *CustomTime `json:"birthday" gorm:"column:birthday;type:datetime;comment:鐢熸棩"` @@ -152,7 +153,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Order("id desc").Find(&records).Error + err := db.Preload("Member").Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/contract.go b/model/contract.go index 04c87a3..1bef87d 100644 --- a/model/contract.go +++ b/model/contract.go @@ -9,7 +9,9 @@ Contract 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"` + Member User `json:"member" gorm:"foreignKey:MemberId"` Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"` QuotationId int `json:"quotationId" gorm:"column:quotation_id;type:int;comment:鎶ヤ环鍗昳d"` Quotation Quotation `json:"quotation" gorm:"foreignKey:QuotationId;references:Id"` @@ -110,7 +112,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Quotation").Order("id desc").Find(&records).Error + err := db.Preload("Client").Preload("Member").Preload("Quotation").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/followRecord.go b/model/followRecord.go index c7671f6..f933a15 100644 --- a/model/followRecord.go +++ b/model/followRecord.go @@ -7,24 +7,27 @@ type ( FollowRecord struct { - Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - ClientId int `json:"client_id" gorm:"column:client_id;type:int(11);comment:瀹㈡埛id"` - ClientStatusId int `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:瀹㈡埛鐘舵�乮d"` - MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:璺熻繘浜篿d"` - Member User `json:"member" gorm:"foreignKey:MemberId"` - Number string `json:"number" gorm:"column:number;type:varchar(255);comment:璺熻繘缂栧彿"` - ContactId int `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:鑱旂郴浜篿d"` - Topic string `json:"topic" gorm:"column:topic;type:varchar(255);comment:璺熻繘涓婚"` - Record string `json:"record" gorm:"column:record;type:MEDIUMTEXT;comment:璺熻繘璁板綍"` - SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int(11);comment:閿�鍞満浼歩d"` - SalesLeadsId int `json:"sales_leads_id" gorm:"column:sales_leads_id;type:int(11);comment:閿�鍞嚎绱d"` - ContactInformationId int `json:"contact_information_id" gorm:"column:contact_information_id;type:int(11);comment:鑱旂郴鏂瑰紡id"` - FollowTime *CustomTime `json:"follow_time" gorm:"column:follow_time;type:datetime;comment:璺熻繘鏃堕棿"` - NextFollowTime *CustomTime `json:"next_follow_time" gorm:"column:next_follow_time;type:datetime;comment:涓嬫璺熻繘鏃堕棿"` - Purpose string `json:"purpose" gorm:"column:purpose;type:varchar(255);comment:璺熻繘鐩殑"` - Content string `json:"content" gorm:"column:content;type:MEDIUMTEXT;comment:璺熻繘鍐呭"` - Client Client `json:"client" gorm:"foreignKey:ClientId"` - Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` + Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` + ClientId int `json:"client_id" gorm:"column:client_id;type:int(11);comment:瀹㈡埛id"` + ClientStatusId int `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:瀹㈡埛鐘舵�乮d"` + ClientStatus ClientStatus `json:"client_status" gorm:"foreignKey:ClientStatusId"` + MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:璺熻繘浜篿d"` + Member User `json:"member" gorm:"foreignKey:MemberId"` + Number string `json:"number" gorm:"column:number;type:varchar(255);comment:璺熻繘缂栧彿"` + ContactId int `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:鑱旂郴浜篿d"` + Topic string `json:"topic" gorm:"column:topic;type:varchar(255);comment:璺熻繘涓婚"` + Record string `json:"record" gorm:"column:record;type:MEDIUMTEXT;comment:璺熻繘璁板綍"` + SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int(11);comment:閿�鍞満浼歩d"` + SaleChance SaleChance `json:"sale_chance" gorm:"foreignKey:SaleChanceId"` + SalesLeadsId int `json:"sales_leads_id" gorm:"column:sales_leads_id;type:int(11);comment:閿�鍞嚎绱d"` + SalesLeads SalesLeads `json:"sales_leads" gorm:"foreignKey:SalesLeadsId"` + ContactInformationId int `json:"contact_information_id" gorm:"column:contact_information_id;type:int(11);comment:鑱旂郴鏂瑰紡id"` + FollowTime *CustomTime `json:"follow_time" gorm:"column:follow_time;type:datetime;comment:璺熻繘鏃堕棿"` + NextFollowTime *CustomTime `json:"next_follow_time" gorm:"column:next_follow_time;type:datetime;comment:涓嬫璺熻繘鏃堕棿"` + Purpose string `json:"purpose" gorm:"column:purpose;type:varchar(255);comment:璺熻繘鐩殑"` + Content string `json:"content" gorm:"column:content;type:MEDIUMTEXT;comment:璺熻繘鍐呭"` + Client Client `json:"client" gorm:"foreignKey:ClientId"` + Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` gorm.Model `json:"-"` } @@ -123,7 +126,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error + err := db.Preload("SalesLeads").Preload("SaleChance").Preload("ClientStatus").Preload("Member").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/masterOrder.go b/model/masterOrder.go index 377a7b3..dcf1f66 100644 --- a/model/masterOrder.go +++ b/model/masterOrder.go @@ -13,6 +13,7 @@ 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"` + Member User `json:"member" gorm:"foreignKey:MemberId"` StartTime *CustomTime `json:"start_time" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"` EndTime *CustomTime `json:"end_time" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"` Money float64 `json:"money" gorm:"column:money;type:decimal(10,2);comment:鎬婚噾棰�"` @@ -107,11 +108,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - if slf.PageNum > 0 && slf.PageSize > 0 { - db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) - } - - err := db.Preload("Client").Order("id desc").Find(&records).Error + err := db.Preload("Member").Preload("Client").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/quotation.go b/model/quotation.go index 4f2b1b5..6aa4c50 100644 --- a/model/quotation.go +++ b/model/quotation.go @@ -8,20 +8,22 @@ type ( // Quotation 鎶ヤ环鍗� Quotation struct { - Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"` - Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鎶ヤ环鍗曞彿"` - QuotationStatusId int `json:"quotation_status_id" gorm:"column:quotation_status_id;type:int;comment:鎶ヤ环鍗曠姸鎬乮d"` - ValidityDate *CustomTime `json:"validity_date" gorm:"column:validity_date;type:datetime;comment:鏈夋晥鏈�"` - ContactId int `json:"contact_id" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"` - MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` - SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"` - Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鎶ヤ环鏉′欢"` - File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"` - Client Client `json:"client" gorm:"foreignKey:ClientId"` - Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` - SaleChance SaleChance `json:"sale_chance" gorm:"foreignKey:SaleChanceId"` - Products []Product `json:"products" gorm:"many2many:quotation_product"` + Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` + ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"` + Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鎶ヤ环鍗曞彿"` + QuotationStatusId int `json:"quotation_status_id" gorm:"column:quotation_status_id;type:int;comment:鎶ヤ环鍗曠姸鎬乮d"` + QuotationStatus QuotationStatus `json:"quotation_status" gorm:"foreignKey:QuotationStatusId"` + ValidityDate *CustomTime `json:"validity_date" gorm:"column:validity_date;type:datetime;comment:鏈夋晥鏈�"` + ContactId int `json:"contact_id" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"` + MemberId int `json:"member_id" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` + Member User `json:"member" gorm:"foreignKey:MemberId"` + SaleChanceId int `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"` + Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鎶ヤ环鏉′欢"` + File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"` + Client Client `json:"client" gorm:"foreignKey:ClientId"` + Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` + SaleChance SaleChance `json:"sale_chance" gorm:"foreignKey:SaleChanceId"` + Products []Product `json:"products" gorm:"many2many:quotation_product"` gorm.Model `json:"-"` } @@ -117,7 +119,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error + err := db.Preload("Member").Preload("QuotationStatus").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/salesLeads.go b/model/salesLeads.go index e33349b..7ec3c69 100644 --- a/model/salesLeads.go +++ b/model/salesLeads.go @@ -133,7 +133,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error + err := db.Preload("Member").Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/salesRefund.go b/model/salesRefund.go index 75a3ad3..c5519c9 100644 --- a/model/salesRefund.go +++ b/model/salesRefund.go @@ -129,7 +129,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Products").Order("id desc").Find(&records).Error + err := db.Preload("BankAccount").Preload("PaymentType").Preload("Member").Preload("Products").Order("id desc").Find(&records).Error return records, total, err } diff --git a/model/salesReturn.go b/model/salesReturn.go index 5e730e7..0b36fef 100644 --- a/model/salesReturn.go +++ b/model/salesReturn.go @@ -92,7 +92,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("Products").Order("id desc").Find(&records).Error + err := db.Preload("Member").Preload("Client").Preload("Products").Order("id desc").Find(&records).Error return records, total, err } 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