From 05582688724c78bc70a7bc860193c67677f6c8cf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 10:46:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
api/v1/salesRefund.go | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/api/v1/salesRefund.go b/api/v1/salesRefund.go
index 6a6f019..00ce774 100644
--- a/api/v1/salesRefund.go
+++ b/api/v1/salesRefund.go
@@ -36,6 +36,23 @@
return
}
+ count, err := model.NewSalesRefundSearch().SetNumber(salesRefund.Number).Count()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触")
+ return
+ }
+ if count > 0 {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�")
+ return
+ }
+
+ if salesRefund.MemberId == 0 {
+ userInfo := utils.GetUserInfo(c)
+ if userInfo.UserType == constvar.UserTypeSub {
+ salesRefund.MemberId = userInfo.CrmUserId
+ }
+ }
+
errCode = salesRefundService.AddSalesRefund(&salesRefund)
if errCode != ecode.OK {
ctx.Fail(errCode)
@@ -143,7 +160,8 @@
salesRefundRes.Reason = salesRefund.Reason
salesRefundRes.Products = salesRefund.Products
salesRefundRes.SourceType = salesRefund.SourceType
- salesRefundRes.SourceId = salesRefund.SourceId
+ salesRefundRes.SalesReturnId = salesRefund.SourceId
+ salesRefundRes.CodeStandID = salesRefund.CodeStandID
return ecode.OK, salesRefundRes
}
@@ -169,7 +187,7 @@
memberIds = []int{userInfo.CrmUserId}
}
- salesRefunds, total, errCode := salesRefundService.GetSalesRefundList(params.Page, params.PageSize, params.KeywordType, params.Keyword, memberIds)
+ salesRefunds, total, errCode := salesRefundService.GetSalesRefundList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.SourceId, memberIds)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
--
Gitblit v1.8.0