From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期二, 17 十月 2023 14:31:31 +0800 Subject: [PATCH] bug修改 --- api/v1/saleChance.go | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/api/v1/saleChance.go b/api/v1/saleChance.go index 6c9d8dc..791ce98 100644 --- a/api/v1/saleChance.go +++ b/api/v1/saleChance.go @@ -1,11 +1,13 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" "aps_crm/pkg/contextx" "aps_crm/pkg/ecode" + "aps_crm/utils" "github.com/gin-gonic/gin" ) @@ -31,11 +33,37 @@ ctx.Fail(errCode) return } + if params.CodeRule.Method != 1 { + count, err := model.NewSaleChanceSearch().SetNumber(saleChance.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "閿�鍞満浼氱紪鐮佸凡瀛樺湪") + return + } + } + + if saleChance.MemberId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + saleChance.MemberId = userInfo.CrmUserId + } + } errCode = saleChanceService.AddSaleChance(&saleChance) if errCode != ecode.OK { ctx.Fail(errCode) return + } + + if params.CodeRule.Method == 1 { + autoCode := model.GetAutoCode(saleChance.Id, ¶ms.CodeRule) + m := map[string]interface{}{ + "number": autoCode, + } + _ = model.NewSaleChanceSearch().SetId(saleChance.Id).UpdateByMap(m) } ctx.Ok() @@ -179,6 +207,7 @@ sc.Address.CityId = saleChance.Address.CityId sc.Address.CountryId = saleChance.Address.CountryId sc.Address.ProvinceId = saleChance.Address.ProvinceId + sc.CodeStandID = saleChance.CodeStandID return ecode.OK, sc } @@ -200,6 +229,14 @@ return } + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + if params.SearchMap == nil { + params.SearchMap = make(map[string]interface{}, 0) + } + params.SearchMap["member_id"] = userInfo.CrmUserId + } + saleChances, total, errCode := saleChanceService.GetSaleChanceList(params.Page, params.PageSize, params.SearchMap) if errCode != ecode.OK { ctx.Fail(errCode) -- Gitblit v1.8.0