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/salesDetails.go |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index a08a5d4..350e9c2 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.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"
 	"strconv"
 )
@@ -18,7 +20,7 @@
 //	@Summary	娣诲姞閿�鍞槑缁�
 //	@Produce	application/json
 //	@Param		object	body		request.AddSalesDetails	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
+//	@Success	200		{object}	contextx.Response{data=request.AddSalesDetails}
 //	@Router		/api/salesDetails/add [post]
 func (s *SalesDetailsApi) Add(c *gin.Context) {
 	var params request.AddSalesDetails
@@ -33,13 +35,28 @@
 		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
 	}
 
-	ctx.Ok()
+	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)
 }
 
 // Delete
@@ -138,6 +155,7 @@
 	salesDetailsModel.LogisticCompany = salesDetails.LogisticCompany
 	salesDetailsModel.LogisticNumber = salesDetails.LogisticNumber
 	salesDetailsModel.LogisticCost = salesDetails.LogisticCost
+	salesDetailsModel.CodeStandID = salesDetails.CodeStandID
 
 	return ecode.OK, salesDetailsModel
 }
@@ -157,7 +175,13 @@
 		return
 	}
 
-	salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
+	var memberIds []int
+	userInfo := utils.GetUserInfo(c)
+	if userInfo.UserType == constvar.UserTypeSub {
+		memberIds = []int{userInfo.CrmUserId}
+	}
+
+	salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params, memberIds)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0