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 | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/v1/salesRefund.go b/api/v1/salesRefund.go index cbce386..00ce774 100644 --- a/api/v1/salesRefund.go +++ b/api/v1/salesRefund.go @@ -36,6 +36,16 @@ 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 { @@ -47,14 +57,6 @@ if errCode != ecode.OK { ctx.Fail(errCode) return - } - - if params.SalesRefund.CodeRule.Method == 1 { - autoCode := model.GetAutoCode(salesRefund.Id, ¶ms.SalesRefund.CodeRule) - m := map[string]interface{}{ - "number": autoCode, - } - _ = model.NewSalesRefundSearch().SetId(salesRefund.Id).UpdateByMap(m) } ctx.Ok() @@ -158,7 +160,7 @@ 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 -- Gitblit v1.8.0