From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0

---
 api/v1/salesDetails.go |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 89831f6..1fbf0d9 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -35,18 +35,27 @@
 		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 {
+			salesDetails.MemberId = userInfo.CrmUserId
+		}
+	}
+
 	errCode = salesDetailsService.AddSalesDetails(&salesDetails)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
-	}
-
-	if params.CodeRule.Method == 1 {
-		autoCode := model.GetAutoCode(salesDetails.Id, &params.CodeRule)
-		m := map[string]interface{}{
-			"number": autoCode,
-		}
-		_ = model.NewSalesDetailsSearch().SetId(salesDetails.Id).UpdateByMap(m)
 	}
 
 	ctx.OkWithDetailed(salesDetails)
@@ -149,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
 }
@@ -171,7 +182,7 @@
 	var memberIds []int
 	userInfo := utils.GetUserInfo(c)
 	if userInfo.UserType == constvar.UserTypeSub {
-		memberIds = []int{userInfo.CrmUserId}
+		memberIds = userInfo.SubUserIds
 	}
 
 	salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params, memberIds)

--
Gitblit v1.8.0