From e517b1a99b6edfa24c8cc4e109a6a10488f23b6a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 28 八月 2023 11:51:55 +0800
Subject: [PATCH] merge
---
docs/docs.go | 926 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 914 insertions(+), 12 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 24ec6b4..a341b7b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3140,6 +3140,364 @@
}
}
},
+ "/m/createMember": {
+ "post": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鍒涘缓Member",
+ "parameters": [
+ {
+ "description": "鍒涘缓Member",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/test.Member"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鑾峰彇鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/deleteMember": {
+ "delete": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鍒犻櫎Member",
+ "parameters": [
+ {
+ "description": "鍒犻櫎Member",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/test.Member"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鍒犻櫎鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/deleteMemberByIds": {
+ "delete": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鎵归噺鍒犻櫎Member",
+ "parameters": [
+ {
+ "description": "鎵归噺鍒犻櫎Member",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.IdsReq"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鎵归噺鍒犻櫎鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/findMember": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鐢╥d鏌ヨMember",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickname",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "uuid",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鏌ヨ鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/getMemberList": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鍒嗛〉鑾峰彇Member鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "endCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鍏抽敭瀛�",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickname",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "uuid",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鑾峰彇鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/getMemberListFromGrpc": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鍒嗛〉鑾峰彇Member鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "endCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鍏抽敭瀛�",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickname",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "uuid",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鑾峰彇鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/m/updateMember": {
+ "put": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Member"
+ ],
+ "summary": "鏇存柊Member",
+ "parameters": [
+ {
+ "description": "鏇存柊Member",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/test.Member"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鏇存柊鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
"/menu/addBaseMenu": {
"post": {
"security": [
@@ -3624,7 +3982,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/test.Product"
+ "$ref": "#/definitions/request.ProductCreate"
}
}
],
@@ -3755,6 +4113,11 @@
},
{
"type": "string",
+ "name": "modelNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "name",
"in": "query"
},
@@ -3781,6 +4144,11 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -3856,6 +4224,11 @@
},
{
"type": "string",
+ "name": "modelNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "name",
"in": "query"
},
@@ -3894,6 +4267,139 @@
{
"type": "integer",
"name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "supplierId",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "unit",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鑾峰彇鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/p/getProductListFromGrpc": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Product"
+ ],
+ "summary": "鍒嗛〉鑾峰彇Product鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "name": "deliveryTime",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "endCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鍏抽敭瀛�",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "maximumStock",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "minimumStock",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "modelNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "name",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "number",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "productType",
+ "in": "query"
+ },
+ {
+ "type": "number",
+ "name": "purchasePrice",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "remark",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "shippingDuration",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "specifications",
"in": "query"
},
{
@@ -4020,11 +4526,6 @@
"in": "query"
},
{
- "type": "integer",
- "name": "supplierId",
- "in": "query"
- },
- {
"type": "string",
"name": "unit",
"in": "query"
@@ -4073,6 +4574,263 @@
"description": "{\"success\":true,\"data\":{},\"msg\":\"鏇存柊鎴愬姛\"}",
"schema": {
"type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/purchase/purchase": {
+ "put": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Purchase"
+ ],
+ "summary": "鏇存柊閲囪喘鍗曚俊鎭�",
+ "parameters": [
+ {
+ "description": "閲囪喘鍗旾D, 閲囪喘鍗曚俊鎭�",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/purchaserequest.AddPurchase"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鏇存柊閲囪喘鍗曚俊鎭�",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "msg": {
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Purchase"
+ ],
+ "summary": "鍒涘缓閲囪喘鍗�",
+ "parameters": [
+ {
+ "description": "閲囪喘鍗曠敤鎴峰悕, 閲囪喘鍗曟墜鏈哄彿鐮�",
+ "name": "data",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/purchaserequest.AddPurchase"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鍒涘缓閲囪喘鍗�",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "msg": {
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/purchase/purchase/{id}": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Purchase"
+ ],
+ "summary": "鑾峰彇鍗曚竴閲囪喘鍗曚俊鎭�",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "閲囪喘鍗旾D",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鑾峰彇鍗曚竴閲囪喘鍗曚俊鎭�,杩斿洖鍖呮嫭閲囪喘鍗曡鎯�",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.PurchaseResponse"
+ },
+ "msg": {
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "delete": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Purchase"
+ ],
+ "summary": "鍒犻櫎閲囪喘鍗�",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "閲囪喘鍗旾D",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鍒犻櫎閲囪喘鍗�",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "msg": {
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/purchase/purchaseList": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Purchase"
+ ],
+ "summary": "鍒嗛〉鑾峰彇鏉冮檺閲囪喘鍗曞垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "鍏抽敭瀛�",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鍒嗛〉鑾峰彇鏉冮檺閲囪喘鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.PageResult"
+ },
+ "msg": {
+ "type": "string"
+ }
+ }
+ }
+ ]
}
}
}
@@ -4310,8 +5068,8 @@
"in": "query"
},
{
- "type": "integer",
- "name": "responsiblePersonId",
+ "type": "string",
+ "name": "responsiblePersonName",
"in": "query"
},
{
@@ -4443,8 +5201,8 @@
"in": "query"
},
{
- "type": "integer",
- "name": "responsiblePersonId",
+ "type": "string",
+ "name": "responsiblePersonName",
"in": "query"
},
{
@@ -7206,6 +7964,10 @@
"description": "鐜鍊�",
"type": "string"
},
+ "grpc-admin-url": {
+ "description": "grpc鏈嶅姟鍦板潃",
+ "type": "string"
+ },
"grpc-url": {
"description": "grpc鏈嶅姟鍦板潃",
"type": "string"
@@ -7426,6 +8188,94 @@
}
}
},
+ "purchase.Purchase": {
+ "type": "object",
+ "properties": {
+ "contact": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
+ },
+ "deliveryDate": {
+ "description": "浜や粯鏃ユ湡",
+ "type": "string"
+ },
+ "id": {
+ "description": "涓婚敭ID",
+ "type": "integer"
+ },
+ "name": {
+ "description": "閲囪喘鍚嶇О",
+ "type": "string"
+ },
+ "phone": {
+ "description": "鑱旂郴浜虹數璇�",
+ "type": "string"
+ },
+ "purchaseTypeId": {
+ "description": "閲囪喘绫诲瀷id",
+ "type": "integer"
+ },
+ "remark": {
+ "description": "澶囨敞",
+ "type": "string"
+ },
+ "signingDate": {
+ "description": "绛剧害鏃ユ湡",
+ "type": "string"
+ },
+ "supplierId": {
+ "description": "渚涘簲鍟唅d",
+ "type": "integer"
+ }
+ }
+ },
+ "purchase.PurchaseProducts": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "閲囪喘鏁伴噺",
+ "type": "number"
+ },
+ "id": {
+ "description": "涓婚敭ID",
+ "type": "integer"
+ },
+ "price": {
+ "description": "閲囪喘鍗曚环",
+ "type": "number"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "integer"
+ },
+ "purchaseId": {
+ "description": "閲囪喘id",
+ "type": "integer"
+ },
+ "remark": {
+ "description": "鎻忚堪",
+ "type": "string"
+ },
+ "total": {
+ "description": "閲囪喘鎬讳环",
+ "type": "number"
+ }
+ }
+ },
+ "purchaserequest.AddPurchase": {
+ "type": "object",
+ "properties": {
+ "productList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/purchase.PurchaseProducts"
+ }
+ },
+ "purchase": {
+ "$ref": "#/definitions/purchase.Purchase"
+ }
+ }
+ },
"request.AddMenuAuthorityInfo": {
"type": "object",
"properties": {
@@ -7596,6 +8446,17 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.ProductCreate": {
+ "type": "object",
+ "properties": {
+ "list": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/test.Product"
+ }
}
}
},
@@ -7864,6 +8725,20 @@
"items": {
"$ref": "#/definitions/request.CasbinInfo"
}
+ }
+ }
+ },
+ "response.PurchaseResponse": {
+ "type": "object",
+ "properties": {
+ "productList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/purchase.PurchaseProducts"
+ }
+ },
+ "purchase": {
+ "$ref": "#/definitions/purchase.Purchase"
}
}
},
@@ -8656,6 +9531,24 @@
}
}
},
+ "test.Member": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "description": "涓婚敭ID",
+ "type": "integer"
+ },
+ "nickname": {
+ "type": "string"
+ },
+ "userName": {
+ "type": "string"
+ },
+ "uuid": {
+ "type": "string"
+ }
+ }
+ },
"test.Product": {
"type": "object",
"properties": {
@@ -8671,6 +9564,9 @@
},
"minimumStock": {
"type": "integer"
+ },
+ "modelNumber": {
+ "type": "string"
},
"name": {
"type": "string"
@@ -8689,6 +9585,12 @@
},
"shippingDuration": {
"type": "integer"
+ },
+ "specifications": {
+ "type": "string"
+ },
+ "supplier": {
+ "$ref": "#/definitions/test.Supplier"
},
"supplierId": {
"type": "integer"
@@ -8738,8 +9640,8 @@
"phone": {
"type": "string"
},
- "responsiblePersonId": {
- "type": "integer"
+ "responsiblePersonName": {
+ "type": "string"
},
"status": {
"type": "integer"
--
Gitblit v1.8.0