From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix
---
api/v1/salesReturn.go | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index caa7150..5e84ff5 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -8,6 +8,7 @@
"aps_crm/pkg/ecode"
"github.com/gin-gonic/gin"
"strconv"
+ "strings"
)
type SalesReturnApi struct{}
@@ -79,14 +80,21 @@
if !ok {
return
}
-
- errCode := salesReturnService.BatchDeleteSalesReturn(params.Ids)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
+ failIds, _ := salesReturnService.BatchDeleteSalesReturn(params.Ids)
+ if len(failIds) == 0 {
+ ctx.Ok()
return
}
-
- ctx.Ok()
+ salesReturns, code := salesReturnService.GetSalesReturnListByIds(failIds)
+ if code != ecode.OK {
+ ctx.Ok()
+ return
+ }
+ var numbers []string
+ for _, salesReturn := range salesReturns {
+ numbers = append(numbers, salesReturn.Number)
+ }
+ ctx.FailWithMsg(ecode.DBErr, strings.Join(numbers, ",")+"鍒犻櫎澶辫触")
}
// Update
@@ -152,7 +160,9 @@
// @Tags 閿�鍞��璐у崟
// @Summary 閿�鍞��璐у崟鍒楄〃
// @Produce application/json
-// @Param object body request.GetSalesReturnList true "鍙傛暟"
+//
+// @Param object body request.GetSalesReturnList true "鍙傛暟"
+//
// @Success 200 {object} contextx.Response{data=response.SalesReturnResponse}
// @Router /api/salesReturn/list [post]
func (con *SalesReturnApi) List(c *gin.Context) {
@@ -162,7 +172,7 @@
return
}
- salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.Keyword)
+ salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
--
Gitblit v1.8.0