From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix

---
 api/v1/saleChance.go |  115 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/api/v1/saleChance.go b/api/v1/saleChance.go
index 72438f3..b938563 100644
--- a/api/v1/saleChance.go
+++ b/api/v1/saleChance.go
@@ -1,7 +1,6 @@
 package v1
 
 import (
-	"aps_crm/constvar"
 	"aps_crm/model"
 	"aps_crm/model/request"
 	"aps_crm/model/response"
@@ -105,29 +104,6 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		SaleChance
-//	@Summary	鑾峰彇閿�鍞満浼氬垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.SaleChanceResponse}
-//	@Router		/api/saleChance/list [get]
-func (s *SaleChanceApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	errCode, list := saleChanceService.GetSaleChanceList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.SaleChanceResponse{
-		List: list,
-	})
-}
 
 // checkSaleChanceParams
 // 妫�鏌ラ攢鍞満浼氬弬鏁�
@@ -135,35 +111,35 @@
 	var errCode int
 	var sc model.SaleChance
 
-	if saleChance.Name == "" {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
-
-	if saleChance.Number == "" {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
-
-	if saleChance.MemberId == 0 {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
-
-	if saleChance.Currency == 0 {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
-
-	if saleChance.ExpectedTime == "" {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
-
-	if saleChance.ProjectedAmount == 0 {
-		errCode = ecode.InvalidParams
-		return errCode, sc
-	}
+	//if saleChance.Name == "" {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
+	//
+	//if saleChance.Number == "" {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
+	//
+	//if saleChance.MemberId == 0 {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
+	//
+	//if saleChance.Currency == 0 {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
+	//
+	//if saleChance.ExpectedTime == "" {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
+	//
+	//if saleChance.ProjectedAmount == 0 {
+	//	errCode = ecode.InvalidParams
+	//	return errCode, sc
+	//}
 
 	t, err := checkTimeFormat(saleChance.ExpectedTime)
 	if err != nil {
@@ -183,10 +159,10 @@
 	sc.MemberId = saleChance.MemberId
 	sc.RegularCustomersId = saleChance.RegularCustomersId
 	sc.Competitors = saleChance.Competitors
-	sc.Possibilities = saleChance.Possibilities
+	sc.PossibilitiesId = saleChance.Possibilities
 	sc.Budget = saleChance.Budget
 	sc.ProjectedAmount = saleChance.ProjectedAmount
-	sc.Currency = constvar.CurrencyType(saleChance.Currency)
+	sc.Currency = saleChance.Currency
 	sc.StatusId = saleChance.StatusId
 	sc.PainPoints = saleChance.PainPoints
 	sc.WhetherEstablished = saleChance.WhetherEstablished
@@ -199,6 +175,8 @@
 	sc.Disadvantages = saleChance.Disadvantages
 	sc.Opportunities = saleChance.Opportunities
 	sc.Threats = saleChance.Threats
+	sc.Remark = saleChance.Remark
+	sc.DetailAddress = saleChance.DetailAddress
 	sc.Address.RegionId = saleChance.Address.RegionId
 	sc.Address.CityId = saleChance.Address.CityId
 	sc.Address.CountryId = saleChance.Address.CountryId
@@ -206,3 +184,30 @@
 
 	return ecode.OK, sc
 }
+
+// List
+//
+//	@Tags		SaleChance
+//	@Summary	閿�鍞満浼氬垪琛�
+//	@Produce	application/json
+//	@Param		object	body		request.GetSaleChanceList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SaleChanceResponse}
+//	@Router		/api/saleChance/list [post]
+func (con *SaleChanceApi) List(c *gin.Context) {
+	var params request.GetSaleChanceList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	saleChances, total, errCode := saleChanceService.GetSaleChanceList(params.Page, params.PageSize, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SaleChanceResponse{
+		List: saleChances,
+		Count: int(total),
+	})
+}
\ No newline at end of file

--
Gitblit v1.8.0