From 2083c6a4f3c69d7f0f1deca562b50df3e8bfd91e Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期六, 26 八月 2023 16:12:41 +0800
Subject: [PATCH] add
---
service/test/product.go | 7 +++
model/test/product.go | 2 +
log/2023-08-26/info.log | 12 ++++++
docs/swagger.yaml | 13 ++++++
docs/docs.go | 21 ++++++++++
docs/swagger.json | 21 ++++++++++
6 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 24ec6b4..9eb2c74 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3784,6 +3784,11 @@
"in": "query"
},
{
+ "type": "string",
+ "name": "specifications",
+ "in": "query"
+ },
+ {
"type": "integer",
"name": "supplierId",
"in": "query"
@@ -3894,6 +3899,11 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -4012,6 +4022,11 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -8690,6 +8705,12 @@
"shippingDuration": {
"type": "integer"
},
+ "specifications": {
+ "type": "string"
+ },
+ "supplier": {
+ "$ref": "#/definitions/test.Supplier"
+ },
"supplierId": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index dc16c93..e512ffe 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3775,6 +3775,11 @@
"in": "query"
},
{
+ "type": "string",
+ "name": "specifications",
+ "in": "query"
+ },
+ {
"type": "integer",
"name": "supplierId",
"in": "query"
@@ -3885,6 +3890,11 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -4003,6 +4013,11 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -8681,6 +8696,12 @@
"shippingDuration": {
"type": "integer"
},
+ "specifications": {
+ "type": "string"
+ },
+ "supplier": {
+ "$ref": "#/definitions/test.Supplier"
+ },
"supplierId": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c9f0237..204a2ff 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1535,6 +1535,10 @@
type: string
shippingDuration:
type: integer
+ specifications:
+ type: string
+ supplier:
+ $ref: '#/definitions/test.Supplier'
supplierId:
type: integer
unit:
@@ -3751,6 +3755,9 @@
name: shippingDuration
type: integer
- in: query
+ name: specifications
+ type: string
+ - in: query
name: supplierId
type: integer
- in: query
@@ -3819,6 +3826,9 @@
- in: query
name: shippingDuration
type: integer
+ - in: query
+ name: specifications
+ type: string
- in: query
name: startCreatedAt
type: string
@@ -3892,6 +3902,9 @@
name: shippingDuration
type: integer
- in: query
+ name: specifications
+ type: string
+ - in: query
name: startCreatedAt
type: string
- in: query
diff --git a/log/2023-08-26/info.log b/log/2023-08-26/info.log
index 5245ea2..36e8828 100644
--- a/log/2023-08-26/info.log
+++ b/log/2023-08-26/info.log
@@ -30,3 +30,15 @@
[srm]2023/08/26 - 15:33:32.998 [34minfo[0m D:/basic.com/srm/initialize/router.go:37 register swagger handler
[srm]2023/08/26 - 15:33:33.016 [34minfo[0m D:/basic.com/srm/initialize/router.go:83 router register success
[srm]2023/08/26 - 15:33:33.030 [34minfo[0m D:/basic.com/srm/core/server.go:36 server run success on {"address": ":8889"}
+[srm]2023/08/26 - 15:40:40.778 [34minfo[0m D:/basic.com/srm/initialize/gorm.go:60 register table success
+[srm]2023/08/26 - 15:40:40.783 [34minfo[0m D:/basic.com/srm/initialize/router.go:37 register swagger handler
+[srm]2023/08/26 - 15:40:40.804 [34minfo[0m D:/basic.com/srm/initialize/router.go:83 router register success
+[srm]2023/08/26 - 15:40:40.818 [34minfo[0m D:/basic.com/srm/core/server.go:36 server run success on {"address": ":8889"}
+[srm]2023/08/26 - 16:06:14.342 [34minfo[0m D:/basic.com/srm/initialize/gorm.go:60 register table success
+[srm]2023/08/26 - 16:06:14.348 [34minfo[0m D:/basic.com/srm/initialize/router.go:37 register swagger handler
+[srm]2023/08/26 - 16:06:14.369 [34minfo[0m D:/basic.com/srm/initialize/router.go:83 router register success
+[srm]2023/08/26 - 16:06:14.370 [34minfo[0m D:/basic.com/srm/core/server.go:36 server run success on {"address": ":8889"}
+[srm]2023/08/26 - 16:09:16.255 [34minfo[0m D:/basic.com/srm/initialize/gorm.go:60 register table success
+[srm]2023/08/26 - 16:09:16.259 [34minfo[0m D:/basic.com/srm/initialize/router.go:37 register swagger handler
+[srm]2023/08/26 - 16:09:16.277 [34minfo[0m D:/basic.com/srm/initialize/router.go:83 router register success
+[srm]2023/08/26 - 16:09:16.292 [34minfo[0m D:/basic.com/srm/core/server.go:36 server run success on {"address": ":8889"}
diff --git a/model/test/product.go b/model/test/product.go
index a2fe356..0f3e474 100644
--- a/model/test/product.go
+++ b/model/test/product.go
@@ -10,10 +10,12 @@
Name string `json:"name" form:"name" gorm:"column:name;comment:鍚嶇О;size:255;"`
Number string `json:"number" form:"number" gorm:"column:number;comment:缂栫爜;size:255;"`
SupplierId uint `json:"supplierId" form:"supplierId" gorm:"column:supplier_id;comment:渚涘簲鍟唅d;size:255;"`
+ Supplier Supplier `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;references:ID;comment:渚涘簲鍟�"`
Unit string `json:"unit" form:"unit" gorm:"column:unit;comment:璁￠噺鍗曚綅;size:255;"`
PurchasePrice *float64 `json:"purchasePrice" form:"purchasePrice" gorm:"column:purchase_price;comment:閲囪喘浠锋牸;"`
DeliveryTime *int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
ShippingDuration *int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"`
+ Specifications string `json:"specifications" form:"specifications" gorm:"column:specifications;comment:瑙勬牸;size:255;"`
ProductType string `json:"productType" form:"productType" gorm:"column:product_type;comment:浜у搧绫诲埆;size:255;"`
MinimumStock *int `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
MaximumStock *int `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
diff --git a/service/test/product.go b/service/test/product.go
index 65a2f7e..0cf3317 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -66,11 +66,16 @@
if info.Unit != "" {
db = db.Where("unit LIKE ?", "%"+info.Unit+"%")
}
+
+ if info.SupplierId != 0 {
+ db = db.Where("supplier_id = ?", info.SupplierId)
+ }
+
err = db.Count(&total).Error
if err != nil {
return
}
- err = db.Limit(limit).Offset(offset).Find(&ps).Error
+ err = db.Limit(limit).Offset(offset).Preload("Supplier").Find(&ps).Error
return ps, total, err
}
--
Gitblit v1.8.0