From 4e3ea78e188813511a59dccd95066c71850edd6a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 八月 2023 10:21:00 +0800
Subject: [PATCH] Merge branch 'zq'
---
model/salesReturn.go | 6 ++
router/salesReturn.go | 9 +-
docs/swagger.yaml | 27 +++++++-
docs/docs.go | 38 +++++++++++-
service/salesReturn.go | 8 ++
api/v1/salesReturn.go | 31 +++++++++-
docs/swagger.json | 38 +++++++++++-
7 files changed, 137 insertions(+), 20 deletions(-)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index 2a55b45..b86ac87 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -14,7 +14,7 @@
// Add
//
-// @Tags SalesReturn
+// @Tags 閿�鍞��璐у崟
// @Summary 娣诲姞閿�鍞��璐�
// @Produce application/json
// @Param object body request.AddSalesReturnRequest true "鏌ヨ鍙傛暟"
@@ -44,7 +44,7 @@
// Delete
//
-// @Tags SalesReturn
+// @Tags 閿�鍞��璐у崟
// @Summary 鍒犻櫎閿�鍞��璐�
// @Produce application/json
// @Param id path int true "鏌ヨ鍙傛暟"
@@ -66,9 +66,32 @@
ctx.Ok()
}
+// BatchDelete
+// @Tags 閿�鍞��璐у崟
+// @Summary 鎵归噺鍒犻櫎閿�鍞��璐у崟
+// @Produce application/json
+// @Param object body request.CommonIds true "鍙傛暟"
+// @Success 200 {object} contextx.Response{}
+// @Router /api/salesReturn/delete [delete]
+func (s *SalesReturnApi) BatchDelete(c *gin.Context) {
+ var params request.CommonIds
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+
+ errCode := salesReturnService.BatchDeleteSalesReturn(params.Ids)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ ctx.Ok()
+}
+
// Update
//
-// @Tags SalesReturn
+// @Tags 閿�鍞��璐у崟
// @Summary 鏇存柊閿�鍞��璐�
// @Produce application/json
// @Param object body request.UpdateSalesReturnRequest true "鏌ヨ鍙傛暟"
@@ -126,7 +149,7 @@
// List
//
-// @Tags SalesReturn
+// @Tags 閿�鍞��璐у崟
// @Summary 閿�鍞��璐у崟鍒楄〃
// @Produce application/json
//
diff --git a/docs/docs.go b/docs/docs.go
index 57597d2..a533727 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7205,7 +7205,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "娣诲姞閿�鍞��璐�",
"parameters": [
@@ -7229,13 +7229,43 @@
}
}
},
+ "/api/salesReturn/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閿�鍞��璐у崟"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞��璐у崟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesReturn/delete/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鍒犻櫎閿�鍞��璐�",
"parameters": [
@@ -7263,7 +7293,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "閿�鍞��璐у崟鍒楄〃",
"parameters": [
@@ -7305,7 +7335,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鏇存柊閿�鍞��璐�",
"parameters": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 8e6da82..949d21f 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7193,7 +7193,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "娣诲姞閿�鍞��璐�",
"parameters": [
@@ -7217,13 +7217,43 @@
}
}
},
+ "/api/salesReturn/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閿�鍞��璐у崟"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞��璐у崟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesReturn/delete/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鍒犻櫎閿�鍞��璐�",
"parameters": [
@@ -7251,7 +7281,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "閿�鍞��璐у崟鍒楄〃",
"parameters": [
@@ -7293,7 +7323,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鏇存柊閿�鍞��璐�",
"parameters": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 80821cb..aea633a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -10387,7 +10387,26 @@
$ref: '#/definitions/contextx.Response'
summary: 娣诲姞閿�鍞��璐�
tags:
- - SalesReturn
+ - 閿�鍞��璐у崟
+ /api/salesReturn/delete:
+ delete:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.CommonIds'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鎵归噺鍒犻櫎閿�鍞��璐у崟
+ tags:
+ - 閿�鍞��璐у崟
/api/salesReturn/delete/{id}:
delete:
parameters:
@@ -10405,7 +10424,7 @@
$ref: '#/definitions/contextx.Response'
summary: 鍒犻櫎閿�鍞��璐�
tags:
- - SalesReturn
+ - 閿�鍞��璐у崟
/api/salesReturn/list:
post:
parameters:
@@ -10429,7 +10448,7 @@
type: object
summary: 閿�鍞��璐у崟鍒楄〃
tags:
- - SalesReturn
+ - 閿�鍞��璐у崟
/api/salesReturn/update:
put:
parameters:
@@ -10448,7 +10467,7 @@
$ref: '#/definitions/contextx.Response'
summary: 鏇存柊閿�鍞��璐�
tags:
- - SalesReturn
+ - 閿�鍞��璐у崟
/api/salesReturnStatus/add:
post:
parameters:
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 17aa2de..c586a7d 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -103,6 +103,12 @@
return db.Delete(&SalesReturn{}).Error
}
+func (slf *SalesReturnSearch) DeleteByIds(ids []int) error {
+ var db = slf.build()
+ db = db.Where("id in ?", ids)
+ return db.Delete(&SalesReturn{}).Error
+}
+
func (slf *SalesReturnSearch) Update(record *SalesReturn) error {
var db = slf.build()
return db.Updates(record).Error
diff --git a/router/salesReturn.go b/router/salesReturn.go
index 8cbb54f..4898841 100644
--- a/router/salesReturn.go
+++ b/router/salesReturn.go
@@ -11,9 +11,10 @@
salesReturnRouter := router.Group("salesReturn")
salesReturnApi := v1.ApiGroup.SalesReturnApi
{
- salesReturnRouter.POST("add", salesReturnApi.Add) // 娣诲姞閿�鍞��璐�
- salesReturnRouter.DELETE("delete/:id", salesReturnApi.Delete) // 鍒犻櫎閿�鍞��璐�
- salesReturnRouter.PUT("update", salesReturnApi.Update) // 鏇存柊閿�鍞��璐�
+ salesReturnRouter.POST("add", salesReturnApi.Add) // 娣诲姞閿�鍞��璐�
+ salesReturnRouter.DELETE("delete/:id", salesReturnApi.Delete) // 鍒犻櫎閿�鍞��璐�
+ salesReturnRouter.DELETE("delete", salesReturnApi.BatchDelete) // 鎵归噺鍒犻櫎閿�鍞��璐у崟
+ salesReturnRouter.PUT("update", salesReturnApi.Update) // 鏇存柊閿�鍞��璐�
salesReturnRouter.POST("list", salesReturnApi.List) // 鑾峰彇閿�鍞��璐у崟鍒楄〃
}
-}
\ No newline at end of file
+}
diff --git a/service/salesReturn.go b/service/salesReturn.go
index e2b3284..b6839ea 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -30,6 +30,14 @@
return ecode.OK
}
+func (SalesReturnService) BatchDeleteSalesReturn(ids []int) int {
+ err := model.NewSalesReturnSearch().DeleteByIds(ids)
+ if err != nil {
+ return ecode.DBErr
+ }
+ return ecode.OK
+}
+
func (SalesReturnService) UpdateSalesReturn(salesReturn *model.SalesReturn) int {
// check salesReturn exist
_, err := model.NewSalesReturnSearch().SetId(salesReturn.Id).Find()
--
Gitblit v1.8.0