From 8bf1cad94113d5c604e95e370cf068efdea87d27 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 09:43:49 +0800
Subject: [PATCH] fix

---
 api/v1/saleChance.go |  152 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 91 insertions(+), 61 deletions(-)

diff --git a/api/v1/saleChance.go b/api/v1/saleChance.go
index 7e91845..6c9d8dc 100644
--- a/api/v1/saleChance.go
+++ b/api/v1/saleChance.go
@@ -1,14 +1,12 @@
 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"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type SaleChanceApi struct{}
@@ -48,17 +46,17 @@
 //	@Tags		SaleChance
 //	@Summary	鍒犻櫎閿�鍞満浼�
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteSaleChance true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/saleChance/delete/{id} [delete]
+//	@Router		/api/saleChance/delete [delete]
 func (s *SaleChanceApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteSaleChance
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := saleChanceService.DeleteSaleChance(id)
+	errCode := saleChanceService.DeleteSaleChance(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -105,65 +103,41 @@
 	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
 // 妫�鏌ラ攢鍞満浼氬弬鏁�
 func checkSaleChanceParams(saleChance request.SaleChance) (int, model.SaleChance) {
 	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 {
@@ -186,7 +160,7 @@
 	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 +173,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 +182,57 @@
 
 	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.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SaleChanceResponse{
+		List:  saleChances,
+		Count: int(total),
+	})
+}
+
+// Push
+//
+//	@Tags		SaleChance
+//	@Summary	鎺ㄨ繘閿�鍞満浼�
+//	@Produce	application/json
+//	@Param		object	body		request.PushSaleChance  true	"鏌ヨ鍙傛暟"
+//	@Success	200	{object}	contextx.Response{}
+//	@Router		/api/saleChance/push [put]
+func (s *SaleChanceApi) Push(c *gin.Context) {
+	var params request.PushSaleChance
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		ctx.Fail(ecode.InvalidParams)
+		return
+	}
+
+	errCode := saleChanceService.PushSaleChance(params.Id, params.Step)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}

--
Gitblit v1.8.0