From 1cd1206c18ed14dd9ebf2baf477f46c847a271b0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 三月 2024 16:39:19 +0800
Subject: [PATCH] merge

---
 api/v1/salesLeads.go |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index 25e1692..530a1bf 100644
--- a/api/v1/salesLeads.go
+++ b/api/v1/salesLeads.go
@@ -175,7 +175,7 @@
 		if params.SearchMap == nil {
 			params.SearchMap = make(map[string]interface{}, 0)
 		}
-		params.SearchMap["member_id"] = userInfo.CrmUserId
+		params.SearchMap["member_ids"] = userInfo.SubUserIds
 	}
 
 	salesLeadss, total, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.SearchMap)
@@ -205,10 +205,19 @@
 		return
 	}
 
-	errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
+	if params.Step == constvar.SalesStatusFail {
+		errCode := salesLeadsService.DeleteSalesLeads([]int{params.Id})
+		if errCode != ecode.OK {
+			ctx.Fail(errCode)
+			return
+		}
+	} else {
+		errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason)
+		if errCode != ecode.OK {
+			ctx.Fail(errCode)
+			return
+		}
 	}
+
 	ctx.Ok()
 }

--
Gitblit v1.8.0