From 4b2c52b17abef8521f9211b4865e1cad0288b12a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 api/v1/quotation.go |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/api/v1/quotation.go b/api/v1/quotation.go
index edfb0ae..7beeb3b 100644
--- a/api/v1/quotation.go
+++ b/api/v1/quotation.go
@@ -34,10 +34,25 @@
 		return
 	}
 
+	if quotation.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			quotation.MemberId = userInfo.CrmUserId
+		}
+	}
+
 	errCode = quotationService.AddQuotation(&quotation)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
+	}
+
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(quotation.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewQuotationSearch(nil).SetId(quotation.Id).Updates(m)
 	}
 
 	ctx.Ok()
@@ -142,6 +157,8 @@
 	quotationModel.Conditions = quotation.Conditions
 	quotationModel.File = quotation.File
 	quotationModel.Products = quotation.Products
+	quotationModel.CodeStandID = quotation.CodeStandID
+	quotationModel.QuotationName = quotation.QuotationName
 
 	return ecode.OK, quotationModel
 

--
Gitblit v1.8.0