From 7438f17c0b3a9f79ee5890c554bedc64c362859b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 14:04:59 +0800
Subject: [PATCH] 销售计划简单数据权限

---
 api/v1/salesReturn.go |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index b86ac87..afc1355 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -6,8 +6,10 @@
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
+	"aps_crm/pkg/structx"
 	"github.com/gin-gonic/gin"
 	"strconv"
+	"strings"
 )
 
 type SalesReturnApi struct{}
@@ -79,14 +81,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
@@ -123,26 +132,10 @@
 }
 
 func checkSalesReturnParams(salesReturn request.SalesReturn) (errCode int, s model.SalesReturn) {
-	//if salesReturn.Number == "" {
-	//	return ecode.InvalidParams, s
-	//}
-	//
-	//if salesReturn.Repository == "" {
-	//	return ecode.InvalidParams, s
-	//}
-	//
-	//if salesReturn.MemberId == 0 {
-	//	return ecode.InvalidParams, s
-	//}
-
-	s.ClientId = salesReturn.ClientId
-	s.ReturnDate = salesReturn.ReturnDate
-	s.Number = salesReturn.Number
-	s.Repository = salesReturn.Repository
-	s.MemberId = salesReturn.MemberId
-	s.SalesReturnStatusId = salesReturn.SalesReturnStatusId
-	s.Reason = salesReturn.Reason
-	s.Products = salesReturn.Products
+	err := structx.AssignTo(salesReturn, &s)
+	if err != nil {
+		return ecode.ParamsErr, s
+	}
 
 	return ecode.OK, s
 }

--
Gitblit v1.8.0