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/salesLeads.go |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index af5f778..e35a85d 100644
--- a/api/v1/salesLeads.go
+++ b/api/v1/salesLeads.go
@@ -7,6 +7,7 @@
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
+	"aps_crm/utils"
 	"github.com/gin-gonic/gin"
 )
 
@@ -27,6 +28,13 @@
 		return
 	}
 
+	if params.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			params.MemberId = userInfo.CrmUserId
+		}
+	}
+
 	errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -37,6 +45,13 @@
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
+	}
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(salesLeads.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewSalesLeadsSearch(nil).SetId(salesLeads.Id).UpdateMap(m)
 	}
 
 	ctx.Ok()
@@ -125,12 +140,14 @@
 		SalesSourcesId:  params.SalesSourcesId,
 		MemberId:        params.MemberId,
 		Desc:            params.Desc,
+		CodeStandID:     params.CodeStandID,
 		Address: model.Address{
 			ProvinceId: params.ProvinceId,
 			CityId:     params.CityId,
 			RegionId:   params.RegionId,
 			CountryId:  params.CountryId,
 		},
+		DetailAddress: params.DetailAddress,
 	}
 
 	return ecode.OK, salesLeads
@@ -151,7 +168,15 @@
 		return
 	}
 
-	salesLeadss, total, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.Keyword)
+	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
+	}
+
+	salesLeadss, total, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.SearchMap)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -162,3 +187,26 @@
 		Count: int(total),
 	})
 }
+
+// Push
+//
+//	@Tags		SalesLeads
+//	@Summary	鎺ㄨ繘閿�鍞嚎绱�
+//	@Produce	application/json
+//	@Param		object	body		request.PushSalesLeads true	"鏌ヨ鍙傛暟"
+//	@Success	200		{object}	contextx.Response{}
+//	@Router		/api/salesLeads/push [post]
+func (s *SalesLeadsApi) Push(c *gin.Context) {
+	var params request.PushSalesLeads
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+	ctx.Ok()
+}

--
Gitblit v1.8.0