fix

wangpengfei

2023-08-02 7e0823fc3b352cfcbb4a2f21088c00db2c00c395

fix

add batch delete function to salesLeads, followRecord module

 api/v1/followRecord.go

@@ -7,7 +7,6 @@
    "aps_crm/pkg/contextx"

    "aps_crm/pkg/ecode"

    "github.com/gin-gonic/gin"

    "strconv"

    "time"

)



@@ -48,17 +47,17 @@
//    @Tags        FollowRecord

//    @Summary    删除跟进记录

//    @Produce    application/json

//    @Param        id    path        string    true    "跟进记录id"

//    @Param        object    body        request.DeleteFollowRecord true    "查询参数"
//    @Success    200    {object}    contextx.Response{}

//    @Router        /api/followRecord/delete/{id} [delete]

//    @Router        /api/followRecord/delete [delete]
func (fr *FollowRecordApi) Delete(c *gin.Context) {

    ctx, ok := contextx.NewContext(c, nil)

    var params request.DeleteFollowRecord
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {

        return

    }



    id, _ := strconv.Atoi(c.Param("id"))

    errCode := followRecordService.DeleteFollowRecord(id)

    errCode := followRecordService.DeleteFollowRecord(params.Ids)
    if errCode != ecode.OK {

        ctx.Fail(errCode)

        return


 api/v1/salesLeads.go

@@ -8,7 +8,6 @@
    "aps_crm/pkg/contextx"
    "aps_crm/pkg/ecode"
    "github.com/gin-gonic/gin"
    "strconv"
)

type SalesLeadsApi struct{}
@@ -48,17 +47,17 @@
//    @Tags        SalesLeads
//    @Summary    删除销售线索
//    @Produce    application/json
//    @Param        id    path        int    true    "查询参数"
//    @Param        object    body        request.DeleteSalesLeads true    "查询参数"
//    @Success    200    {object}    contextx.Response{}
//    @Router        /api/salesLeads/delete/{id} [delete]
//    @Router        /api/salesLeads/delete [delete]
func (s *SalesLeadsApi) Delete(c *gin.Context) {
    ctx, ok := contextx.NewContext(c, nil)
    var params request.DeleteSalesLeads
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    id, _ := strconv.Atoi(c.Param("id"))
    errCode := salesLeadsService.DeleteSalesLeads(id)
    errCode := salesLeadsService.DeleteSalesLeads(params.Ids)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return

 docs/docs.go

@@ -2106,7 +2106,7 @@
                }
            }
        },
        "/api/followRecord/delete/{id}": {
        "/api/followRecord/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -2117,11 +2117,13 @@
                "summary": "删除跟进记录",
                "parameters": [
                    {
                        "type": "string",
                        "description": "跟进记录id",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteFollowRecord"
                        }
                    }
                ],
                "responses": {
@@ -4943,7 +4945,7 @@
                }
            }
        },
        "/api/salesLeads/delete/{id}": {
        "/api/salesLeads/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -4954,11 +4956,13 @@
                "summary": "删除销售线索",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteSalesLeads"
                        }
                    }
                ],
                "responses": {
@@ -9954,6 +9958,28 @@
                }
            }
        },
        "request.DeleteFollowRecord": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteSalesLeads": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteUserReq": {
            "type": "object",
            "properties": {

 docs/swagger.json

@@ -2094,7 +2094,7 @@
                }
            }
        },
        "/api/followRecord/delete/{id}": {
        "/api/followRecord/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -2105,11 +2105,13 @@
                "summary": "删除跟进记录",
                "parameters": [
                    {
                        "type": "string",
                        "description": "跟进记录id",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteFollowRecord"
                        }
                    }
                ],
                "responses": {
@@ -4931,7 +4933,7 @@
                }
            }
        },
        "/api/salesLeads/delete/{id}": {
        "/api/salesLeads/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -4942,11 +4944,13 @@
                "summary": "删除销售线索",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteSalesLeads"
                        }
                    }
                ],
                "responses": {
@@ -9942,6 +9946,28 @@
                }
            }
        },
        "request.DeleteFollowRecord": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteSalesLeads": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteUserReq": {
            "type": "object",
            "properties": {

 docs/swagger.yaml

@@ -1918,6 +1918,20 @@
        description: 国家ID
        type: integer
    type: object
  request.DeleteFollowRecord:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteSalesLeads:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteUserReq:
    properties:
      userId:
@@ -5372,14 +5386,15 @@
      summary: 添加跟进记录
      tags:
      - FollowRecord
  /api/followRecord/delete/{id}:
  /api/followRecord/delete:
    delete:
      parameters:
      - description: 跟进记录id
        in: path
        name: id
      - description: 查询参数
        in: body
        name: object
        required: true
        type: string
        schema:
          $ref: '#/definitions/request.DeleteFollowRecord'
      produces:
      - application/json
      responses:
@@ -7114,14 +7129,15 @@
      summary: 添加销售线索
      tags:
      - SalesLeads
  /api/salesLeads/delete/{id}:
  /api/salesLeads/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteSalesLeads'
      produces:
      - application/json
      responses:

 model/followRecord.go

@@ -183,3 +183,7 @@
    slf.OrderBy = order

    return slf

}

func (slf *FollowRecordSearch) SetIds(ids []int) *FollowRecordSearch {
    slf.Orm = slf.Orm.Where("id in (?)", ids)
    return slf
}

 model/request/followRecord.go

@@ -30,3 +30,7 @@
    PageInfo

    Keyword string `json:"keyword"`

}


type DeleteFollowRecord struct {
    Ids []int `json:"ids"`
}

 model/request/salesLeads.go

@@ -25,3 +25,7 @@
    PageInfo
    Keyword string `json:"keyword"`
}

type DeleteSalesLeads struct {
    Ids []int `json:"ids"`
}

 model/salesLeads.go

@@ -163,3 +163,7 @@
    var db = slf.build()
    return db.Updates(data).Error
}
func (slf *SalesLeadsSearch) SetIds(ids []int) *SalesLeadsSearch {
    slf.Orm = slf.Orm.Where("id in (?)", ids)
    return slf
}

 router/followRecord.go

@@ -12,7 +12,7 @@
    followRecordApi := v1.ApiGroup.FollowRecordApi
    {
        followRecordRouter.POST("add", followRecordApi.Add)             // 添加跟进记录
        followRecordRouter.DELETE("delete/:id", followRecordApi.Delete) // 删除跟进记录
        followRecordRouter.DELETE("delete", followRecordApi.Delete)     // 删除跟进记录
        followRecordRouter.PUT("update", followRecordApi.Update)        // 更新跟进记录
        followRecordRouter.POST("list", followRecordApi.List)            // 获取跟进记录列表
    }

 router/salesLeads.go

@@ -12,7 +12,7 @@
    salesLeadsApi := v1.ApiGroup.SalesLeadsApi
    {
        salesLeadsRouter.POST("add", salesLeadsApi.Add)             // 添加销售线索
        salesLeadsRouter.DELETE("delete/:id", salesLeadsApi.Delete) // 删除销售线索
        salesLeadsRouter.DELETE("delete", salesLeadsApi.Delete)     // 删除销售线索
        salesLeadsRouter.PUT("update", salesLeadsApi.Update)        // 更新销售线索
        salesLeadsRouter.POST("list", salesLeadsApi.List)            // 获取销售线索列表
    }

 service/followRecord.go

@@ -15,21 +15,6 @@
    return ecode.OK

}



func (FollowRecordService) DeleteFollowRecord(id int) int {

    // check followRecord exist

    _, err := model.NewFollowRecordSearch().SetId(id).First()

    if err != nil {

        return ecode.FollowRecordNotExist

    }



    // delete followRecord

    err = model.NewFollowRecordSearch().SetId(id).Delete()

    if err != nil {

        return ecode.FollowRecordDeleteErr

    }

    return ecode.OK

}



// check followRecord exist

func checkFollowRecordExist(id int) int {

    _, err := model.NewFollowRecordSearch().SetId(id).First()

@@ -63,3 +48,12 @@
    }

    return contacts, total, ecode.OK

}

func (FollowRecordService) DeleteFollowRecord(ids []int) int {
    // delete client
    err := model.NewFollowRecordSearch().SetIds(ids).Delete()
    if err != nil {
        return ecode.FollowRecordDeleteErr
    }
    return ecode.OK
}

 service/salesLeads.go

@@ -15,21 +15,6 @@
    return ecode.OK
}

func (SalesLeadsService) DeleteSalesLeads(id int) int {
    // check salesLeads exist
    _, err := model.NewSalesLeadsSearch().SetId(id).Find()
    if err != nil {
        return ecode.SalesLeadsNotExist
    }

    // delete salesLeads
    err = model.NewSalesLeadsSearch().SetId(id).Delete()
    if err != nil {
        return ecode.SalesLeadsDeleteErr
    }
    return ecode.OK
}

func (SalesLeadsService) UpdateSalesLeads(salesLeads *model.SalesLeads) int {
    // update salesLeads
    err := model.NewSalesLeadsSearch().SetId(salesLeads.Id).Update(salesLeads)
@@ -80,3 +65,12 @@

    return ecode.OK
}

func (SalesLeadsService) DeleteSalesLeads(ids []int) int {
    // delete client
    err := model.NewSalesLeadsSearch().SetIds(ids).Delete()
    if err != nil {
        return ecode.SalesLeadsDeleteErr
    }
    return ecode.OK
}