From 69ac5c4605f340144144a4b0954c7768697e95e6 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 14:25:56 +0800
Subject: [PATCH] add
---
api/v1/saleChance.go | 451 +++++++++++++++++++++-------------------
router/saleChance.go | 5
service/saleChance.go | 22 ++
model/request/saleChance.go | 5
docs/swagger.yaml | 29 ++
docs/docs.go | 45 ++++
docs/swagger.json | 45 ++++
7 files changed, 388 insertions(+), 214 deletions(-)
diff --git a/api/v1/saleChance.go b/api/v1/saleChance.go
index feb94a0..245d7f8 100644
--- a/api/v1/saleChance.go
+++ b/api/v1/saleChance.go
@@ -1,212 +1,239 @@
-package v1
-
-import (
- "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{}
-
-// Add
-//
-// @Tags SaleChance
-// @Summary 娣诲姞閿�鍞満浼�
-// @Produce application/json
-// @Param object body request.AddSaleChance true "鏌ヨ鍙傛暟"
-// @Success 200 {object} contextx.Response{}
-// @Router /api/saleChance/add [post]
-func (s *SaleChanceApi) Add(c *gin.Context) {
- var params request.AddSaleChance
- ctx, ok := contextx.NewContext(c, ¶ms)
- if !ok {
- return
- }
-
- errCode, saleChance := checkSaleChanceParams(params.SaleChance)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
- }
-
- errCode = saleChanceService.AddSaleChance(&saleChance)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
- }
-
- ctx.Ok()
-}
-
-// Delete
-//
-// @Tags SaleChance
-// @Summary 鍒犻櫎閿�鍞満浼�
-// @Produce application/json
-// @Param id path int true "鏌ヨ鍙傛暟"
-// @Success 200 {object} contextx.Response{}
-// @Router /api/saleChance/delete/{id} [delete]
-func (s *SaleChanceApi) Delete(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
- return
- }
-
- id, _ := strconv.Atoi(c.Param("id"))
- errCode := saleChanceService.DeleteSaleChance(id)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
- }
-
- ctx.Ok()
-}
-
-// Update
-//
-// @Tags SaleChance
-// @Summary 鏇存柊閿�鍞満浼�
-// @Produce application/json
-// @Param object body request.UpdateSaleChance true "鏌ヨ鍙傛暟"
-// @Success 200 {object} contextx.Response{}
-// @Router /api/saleChance/update [put]
-func (s *SaleChanceApi) Update(c *gin.Context) {
- var params request.UpdateSaleChance
- ctx, ok := contextx.NewContext(c, ¶ms)
- if !ok {
- return
- }
-
- // check id
- if params.Id == 0 {
- ctx.Fail(ecode.InvalidParams)
- return
- }
-
- errCode, saleChance := checkSaleChanceParams(params.SaleChance)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
- }
-
- saleChance.Id = params.Id
-
- errCode = saleChanceService.UpdateSaleChance(&saleChance)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
- }
-
- ctx.Ok()
-}
-
-// 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
- //}
-
- t, err := checkTimeFormat(saleChance.ExpectedTime)
- if err != nil {
- errCode = ecode.InvalidParams
- return errCode, sc
- }
-
- sc.ExpectedTime = t
-
- sc.Name = saleChance.Name
- sc.Number = saleChance.Number
- sc.ContactId = saleChance.ContactId
- sc.ClientId = saleChance.ClientId
- sc.SalesSourcesId = saleChance.SalesSourcesId
- sc.SaleTypeId = saleChance.SaleTypeId
- sc.SaleStageId = saleChance.SaleStageId
- sc.MemberId = saleChance.MemberId
- sc.RegularCustomersId = saleChance.RegularCustomersId
- sc.Competitors = saleChance.Competitors
- sc.PossibilitiesId = saleChance.Possibilities
- sc.Budget = saleChance.Budget
- sc.ProjectedAmount = saleChance.ProjectedAmount
- sc.Currency = saleChance.Currency
- sc.StatusId = saleChance.StatusId
- sc.PainPoints = saleChance.PainPoints
- sc.WhetherEstablished = saleChance.WhetherEstablished
- sc.CapitalBudget = saleChance.CapitalBudget
- sc.KeyMaker = saleChance.KeyMaker
- sc.KeyFactors = saleChance.KeyFactors
- sc.Process = saleChance.Process
- sc.Solutions = saleChance.Solutions
- sc.Advantages = saleChance.Advantages
- 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
- sc.Address.ProvinceId = saleChance.Address.ProvinceId
-
- 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, ¶ms)
- 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
+package v1
+
+import (
+ "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{}
+
+// Add
+//
+// @Tags SaleChance
+// @Summary 娣诲姞閿�鍞満浼�
+// @Produce application/json
+// @Param object body request.AddSaleChance true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{}
+// @Router /api/saleChance/add [post]
+func (s *SaleChanceApi) Add(c *gin.Context) {
+ var params request.AddSaleChance
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+
+ errCode, saleChance := checkSaleChanceParams(params.SaleChance)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ errCode = saleChanceService.AddSaleChance(&saleChance)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ ctx.Ok()
+}
+
+// Delete
+//
+// @Tags SaleChance
+// @Summary 鍒犻櫎閿�鍞満浼�
+// @Produce application/json
+// @Param id path int true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{}
+// @Router /api/saleChance/delete/{id} [delete]
+func (s *SaleChanceApi) Delete(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+
+ id, _ := strconv.Atoi(c.Param("id"))
+ errCode := saleChanceService.DeleteSaleChance(id)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ ctx.Ok()
+}
+
+// Update
+//
+// @Tags SaleChance
+// @Summary 鏇存柊閿�鍞満浼�
+// @Produce application/json
+// @Param object body request.UpdateSaleChance true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{}
+// @Router /api/saleChance/update [put]
+func (s *SaleChanceApi) Update(c *gin.Context) {
+ var params request.UpdateSaleChance
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+
+ // check id
+ if params.Id == 0 {
+ ctx.Fail(ecode.InvalidParams)
+ return
+ }
+
+ errCode, saleChance := checkSaleChanceParams(params.SaleChance)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ saleChance.Id = params.Id
+
+ errCode = saleChanceService.UpdateSaleChance(&saleChance)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ ctx.Ok()
+}
+
+// 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
+ //}
+
+ t, err := checkTimeFormat(saleChance.ExpectedTime)
+ if err != nil {
+ errCode = ecode.InvalidParams
+ return errCode, sc
+ }
+
+ sc.ExpectedTime = t
+
+ sc.Name = saleChance.Name
+ sc.Number = saleChance.Number
+ sc.ContactId = saleChance.ContactId
+ sc.ClientId = saleChance.ClientId
+ sc.SalesSourcesId = saleChance.SalesSourcesId
+ sc.SaleTypeId = saleChance.SaleTypeId
+ sc.SaleStageId = saleChance.SaleStageId
+ sc.MemberId = saleChance.MemberId
+ sc.RegularCustomersId = saleChance.RegularCustomersId
+ sc.Competitors = saleChance.Competitors
+ sc.PossibilitiesId = saleChance.Possibilities
+ sc.Budget = saleChance.Budget
+ sc.ProjectedAmount = saleChance.ProjectedAmount
+ sc.Currency = saleChance.Currency
+ sc.StatusId = saleChance.StatusId
+ sc.PainPoints = saleChance.PainPoints
+ sc.WhetherEstablished = saleChance.WhetherEstablished
+ sc.CapitalBudget = saleChance.CapitalBudget
+ sc.KeyMaker = saleChance.KeyMaker
+ sc.KeyFactors = saleChance.KeyFactors
+ sc.Process = saleChance.Process
+ sc.Solutions = saleChance.Solutions
+ sc.Advantages = saleChance.Advantages
+ 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
+ sc.Address.ProvinceId = saleChance.Address.ProvinceId
+
+ 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, ¶ms)
+ 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),
+ })
+}
+
+// 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, ¶ms)
+ if !ok {
+ ctx.Fail(ecode.InvalidParams)
+ return
+ }
+
+ errCode := saleChanceService.PushSaleChance(params.Id, params.Step)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+
+ ctx.Ok()
+}
diff --git a/docs/docs.go b/docs/docs.go
index f31661e..62f6386 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -6388,6 +6388,36 @@
}
}
},
+ "/api/saleChance/push": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SaleChance"
+ ],
+ "summary": "鎺ㄨ繘閿�鍞満浼�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PushSaleChance"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/saleChance/update": {
"put": {
"produces": [
@@ -14863,6 +14893,21 @@
}
}
},
+ "request.PushSaleChance": {
+ "type": "object",
+ "required": [
+ "id",
+ "step"
+ ],
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "step": {
+ "type": "integer"
+ }
+ }
+ },
"request.PushSalesLeads": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 109a2b7..f8fd45c 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -6376,6 +6376,36 @@
}
}
},
+ "/api/saleChance/push": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SaleChance"
+ ],
+ "summary": "鎺ㄨ繘閿�鍞満浼�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PushSaleChance"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/saleChance/update": {
"put": {
"produces": [
@@ -14851,6 +14881,21 @@
}
}
},
+ "request.PushSaleChance": {
+ "type": "object",
+ "required": [
+ "id",
+ "step"
+ ],
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "step": {
+ "type": "integer"
+ }
+ }
+ },
"request.PushSalesLeads": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c71de32..fb21e1c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3365,6 +3365,16 @@
subOrderId:
type: integer
type: object
+ request.PushSaleChance:
+ properties:
+ id:
+ type: integer
+ step:
+ type: integer
+ required:
+ - id
+ - step
+ type: object
request.PushSalesLeads:
properties:
id:
@@ -9528,6 +9538,25 @@
summary: 閿�鍞満浼氬垪琛�
tags:
- SaleChance
+ /api/saleChance/push:
+ put:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.PushSaleChance'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鎺ㄨ繘閿�鍞満浼�
+ tags:
+ - SaleChance
/api/saleChance/update:
put:
parameters:
diff --git a/model/request/saleChance.go b/model/request/saleChance.go
index 7d5c4f1..b175a1e 100644
--- a/model/request/saleChance.go
+++ b/model/request/saleChance.go
@@ -46,3 +46,8 @@
PageInfo
Keyword string `json:"keyword"`
}
+
+type PushSaleChance struct {
+ Id int `json:"id" binding:"required"`
+ Step int `json:"step" binding:"required"`
+}
diff --git a/router/saleChance.go b/router/saleChance.go
index 5844d07..93cc68a 100644
--- a/router/saleChance.go
+++ b/router/saleChance.go
@@ -14,6 +14,7 @@
saleChanceRouter.POST("add", saleChanceApi.Add) // 娣诲姞閿�鍞満浼�
saleChanceRouter.DELETE("delete/:id", saleChanceApi.Delete) // 鍒犻櫎閿�鍞満浼�
saleChanceRouter.PUT("update", saleChanceApi.Update) // 鏇存柊閿�鍞満浼�
- saleChanceRouter.POST("list", saleChanceApi.List) // 鑾峰彇閿�鍞満浼氬垪琛�
+ saleChanceRouter.POST("list", saleChanceApi.List) // 鑾峰彇閿�鍞満浼氬垪琛�
+ saleChanceRouter.PUT("push", saleChanceApi.Push) // 鎺ㄨ繘閿�鍞満浼�
}
-}
\ No newline at end of file
+}
diff --git a/service/saleChance.go b/service/saleChance.go
index 4c42d23..24dedae 100644
--- a/service/saleChance.go
+++ b/service/saleChance.go
@@ -62,3 +62,25 @@
}
return contacts, total, ecode.OK
}
+
+// push
+func (SaleChanceService) PushSaleChance(id, step int) int {
+ // check saleChange exist
+ errCode := CheckSaleChangeExist(id)
+ if errCode != ecode.OK {
+ return errCode
+ }
+ // check step
+ _, err := model.NewSaleStageSearch().SetId(step).Find()
+ if err != nil {
+ return ecode.SaleStageNotExist
+ }
+
+ // push saleChange
+ err = model.NewSaleChanceSearch().SetId(id).Update(&model.SaleChance{SaleStageId: step})
+ if err != nil {
+ return ecode.SaleChanceUpdateErr
+ }
+
+ return ecode.OK
+}
--
Gitblit v1.8.0