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/salesDetails.go | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go index 350e9c2..1a1e37d 100644 --- a/api/v1/salesDetails.go +++ b/api/v1/salesDetails.go @@ -35,6 +35,16 @@ return } + count, err := model.NewSalesDetailsSearch().SetNumber(params.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") + return + } + if salesDetails.MemberId == 0 { userInfo := utils.GetUserInfo(c) if userInfo.UserType == constvar.UserTypeSub { @@ -46,14 +56,6 @@ if errCode != ecode.OK { ctx.Fail(errCode) return - } - - if params.CodeRule.Method == 1 { - autoCode := model.GetAutoCode(salesDetails.Id, ¶ms.CodeRule) - m := map[string]interface{}{ - "number": autoCode, - } - _ = model.NewSalesDetailsSearch().SetId(salesDetails.Id).UpdateByMap(m) } ctx.OkWithDetailed(salesDetails) @@ -156,6 +158,8 @@ salesDetailsModel.LogisticNumber = salesDetails.LogisticNumber salesDetailsModel.LogisticCost = salesDetails.LogisticCost salesDetailsModel.CodeStandID = salesDetails.CodeStandID + salesDetailsModel.DeliverType = salesDetails.DeliverType + salesDetailsModel.QuotationId = salesDetails.QuotationId return ecode.OK, salesDetailsModel } -- Gitblit v1.8.0