Merge branch 'master' into fly

wangpengfei

2023-08-02 b4201a0054369a8cd89e940947fd6f1a89f357c2

 api/v1/salesLeads.go

@@ -99,30 +99,6 @@
   ctx.Ok()
}

// List
//
//   @Tags      SalesLeads
//   @Summary   获取销售线索列表
//   @Produce   application/json
//   @Success   200   {object}   contextx.Response{data=response.SalesLeadsResponse}
//   @Router      /api/salesLeads/list [get]
func (s *SalesLeadsApi) List(c *gin.Context) {
   ctx, ok := contextx.NewContext(c, nil)
   if !ok {
      return
   }

   errCode, salesLeadsList := salesLeadsService.GetSalesLeadsList()
   if errCode != ecode.OK {
      ctx.Fail(errCode)
      return
   }

   ctx.OkWithDetailed(response.SalesLeadsResponse{
      List: salesLeadsList,
   })
}

func checkSalesLeadsParams(params request.SalesLeads) (errCode int, salesLeads model.SalesLeads) {
   //if params.Name == "" {
   //   return ecode.InvalidParams, salesLeads
@@ -160,3 +136,30 @@

   return ecode.OK, salesLeads
}

// List
//
//   @Tags      SalesLeads
//   @Summary   销售线索列表
//   @Produce   application/json
//   @Param      object   body      request.GetSalesLeadsList   true   "参数"
//   @Success   200      {object}   contextx.Response{data=response.SalesLeadsResponse}
//   @Router      /api/salesLeads/list [post]
func (con *SalesLeadsApi) List(c *gin.Context) {
   var params request.GetSalesLeadsList
   ctx, ok := contextx.NewContext(c, &params)
   if !ok {
      return
   }

   salesLeadss, total, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.Keyword)
   if errCode != ecode.OK {
      ctx.Fail(errCode)
      return
   }

   ctx.OkWithDetailed(response.SalesLeadsResponse{
      List: salesLeadss,
      Count: int(total),
   })
}