add

wangpengfei

2023-08-03 fe3906038b25efaf0983a7cf5fede29e26d35093

add

add the method advancement of salesLead

 api/v1/client.go

@@ -32,9 +32,7 @@
        return
    }

    // check member exist

    errCode = clientService.AddClient(client)
    errCode = clientService.AddClient(client, params.SalesLeadsId)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return

 constvar/const.go

@@ -35,13 +35,12 @@
type SalesStatus int

const (
    SalesStatusNew                           SalesStatus = iota + 1
    SalesStatusIng                                       // 进行中
    SalesStatusSuccess                                   // 成功
    SalesStatusFail                                      // 失败
    SalesStatusLevelUptoClient                           // 升级为客户
    SalesStatusLevelUptoClientAndSalesChance             // 升级为客户并且有销售机会

    SalesStatusFail                          SalesStatus = -1   // 失败
    SalesStatusNew                           SalesStatus = iota // 新建
    SalesStatusIng                                              // 进行中
    SalesStatusSuccess                                          // 成功
    SalesStatusLevelUptoClient                                  // 升级为客户
    SalesStatusLevelUptoClientAndSalesChance                    // 升级为客户并且有销售机会
)

type CurrencyType int

 docs/docs.go

@@ -7093,25 +7093,26 @@
        "constvar.SalesStatus": {
            "type": "integer",
            "enum": [
                -1,
                1,
                2,
                3,
                4,
                5,
                6
                5
            ],
            "x-enum-comments": {
                "SalesStatusFail": "失败",
                "SalesStatusIng": "进行中",
                "SalesStatusLevelUptoClient": "升级为客户",
                "SalesStatusLevelUptoClientAndSalesChance": "升级为客户并且有销售机会",
                "SalesStatusNew": "新建",
                "SalesStatusSuccess": "成功"
            },
            "x-enum-varnames": [
                "SalesStatusFail",
                "SalesStatusNew",
                "SalesStatusIng",
                "SalesStatusSuccess",
                "SalesStatusFail",
                "SalesStatusLevelUptoClient",
                "SalesStatusLevelUptoClientAndSalesChance"
            ]
@@ -8815,6 +8816,10 @@
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
@@ -9666,6 +9671,10 @@
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
@@ -10814,6 +10823,10 @@
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
@@ -12213,6 +12226,10 @@
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"

 docs/swagger.json

@@ -7081,25 +7081,26 @@
        "constvar.SalesStatus": {
            "type": "integer",
            "enum": [
                -1,
                1,
                2,
                3,
                4,
                5,
                6
                5
            ],
            "x-enum-comments": {
                "SalesStatusFail": "失败",
                "SalesStatusIng": "进行中",
                "SalesStatusLevelUptoClient": "升级为客户",
                "SalesStatusLevelUptoClientAndSalesChance": "升级为客户并且有销售机会",
                "SalesStatusNew": "新建",
                "SalesStatusSuccess": "成功"
            },
            "x-enum-varnames": [
                "SalesStatusFail",
                "SalesStatusNew",
                "SalesStatusIng",
                "SalesStatusSuccess",
                "SalesStatusFail",
                "SalesStatusLevelUptoClient",
                "SalesStatusLevelUptoClientAndSalesChance"
            ]
@@ -8803,6 +8804,10 @@
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
@@ -9654,6 +9659,10 @@
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
@@ -10802,6 +10811,10 @@
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
@@ -12201,6 +12214,10 @@
                    "description": "法人代表",
                    "type": "string"
                },
                "sales_leads_id": {
                    "description": "销售线索ID",
                    "type": "integer"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"

 docs/swagger.yaml

@@ -1,24 +1,25 @@
definitions:
  constvar.SalesStatus:
    enum:
    - -1
    - 1
    - 2
    - 3
    - 4
    - 5
    - 6
    type: integer
    x-enum-comments:
      SalesStatusFail: 失败
      SalesStatusIng: 进行中
      SalesStatusLevelUptoClient: 升级为客户
      SalesStatusLevelUptoClientAndSalesChance: 升级为客户并且有销售机会
      SalesStatusNew: 新建
      SalesStatusSuccess: 成功
    x-enum-varnames:
    - SalesStatusFail
    - SalesStatusNew
    - SalesStatusIng
    - SalesStatusSuccess
    - SalesStatusFail
    - SalesStatusLevelUptoClient
    - SalesStatusLevelUptoClientAndSalesChance
  constvar.UserType:
@@ -1144,6 +1145,9 @@
      representative:
        description: 法人代表
        type: string
      sales_leads_id:
        description: 销售线索ID
        type: integer
      service_member_id:
        description: 服务负责人ID
        type: integer
@@ -1713,6 +1717,9 @@
      representative:
        description: 法人代表
        type: string
      sales_leads_id:
        description: 销售线索ID
        type: integer
      service_member_id:
        description: 服务负责人ID
        type: integer
@@ -2495,6 +2502,9 @@
      representative:
        description: 法人代表
        type: string
      sales_leads_id:
        description: 销售线索ID
        type: integer
      service_member_id:
        description: 服务负责人ID
        type: integer
@@ -3428,6 +3438,9 @@
      representative:
        description: 法人代表
        type: string
      sales_leads_id:
        description: 销售线索ID
        type: integer
      service_member_id:
        description: 服务负责人ID
        type: integer

 model/request/client.go

@@ -18,6 +18,7 @@
    NextVisitTime     string  `json:"next_visit_time"`     // 下次回访时间
    LatestServiceTime string  `json:"latest_service_time"` // 最晚服务时间
    Contact           Contact `json:"contact"`
    SalesLeadsId      int     `json:"sales_leads_id"` // 销售线索ID
    Address
    Business
}

 model/salesLeads.go

@@ -38,9 +38,13 @@
    return "sales_leads"
}

func NewSalesLeadsSearch() *SalesLeadsSearch {
func NewSalesLeadsSearch(db *gorm.DB) *SalesLeadsSearch {
    if db == nil {
        db = mysqlx.GetDB()
    }

    return &SalesLeadsSearch{
        Orm: mysqlx.GetDB(),
        Orm: db,
    }
}


 service/client.go

@@ -3,15 +3,33 @@
import (
    "aps_crm/model"
    "aps_crm/pkg/ecode"
    "aps_crm/pkg/mysqlx"
)

type ClientService struct{}

func (ClientService) AddClient(client *model.Client) int {
    err := model.NewClientSearch(nil).Create(client)
    if err != nil {
        return ecode.ClientExist
func (ClientService) AddClient(client *model.Client, sId int) int {
    if sId == 0 {
        err := model.NewClientSearch(nil).Create(client)
        if err != nil {
            return ecode.ClientExist
        }
    } else {
        tx := mysqlx.GetDB().Begin()
        err := model.NewClientSearch(tx).Create(client)
        if err != nil {
            tx.Rollback()
            return ecode.ClientExist
        }

        err = model.NewSalesLeadsSearch(tx).SetId(sId).Delete()
        if err != nil {
            tx.Rollback()
            return ecode.ClientExist
        }
        tx.Commit()
    }

    return ecode.OK
}


 service/salesLeads.go

@@ -8,7 +8,7 @@
type SalesLeadsService struct{}

func (SalesLeadsService) AddSalesLeads(salesLeads *model.SalesLeads) int {
    err := model.NewSalesLeadsSearch().Create(salesLeads)
    err := model.NewSalesLeadsSearch(nil).Create(salesLeads)
    if err != nil {
        return ecode.SalesLeadsExist
    }
@@ -17,7 +17,7 @@

func (SalesLeadsService) UpdateSalesLeads(salesLeads *model.SalesLeads) int {
    // update salesLeads
    err := model.NewSalesLeadsSearch().SetId(salesLeads.Id).Update(salesLeads)
    err := model.NewSalesLeadsSearch(nil).SetId(salesLeads.Id).Update(salesLeads)
    if err != nil {
        return ecode.SalesLeadsUpdateErr
    }
@@ -27,7 +27,7 @@

// CheckSalesLeadsExist check salesLeads exist
func CheckSalesLeadsExist(id int) int {
    tmp, err := model.NewSalesLeadsSearch().SetId(id).Find()
    tmp, err := model.NewSalesLeadsSearch(nil).SetId(id).Find()
    if err != nil {
        return ecode.SalesLeadsNotExist
    }
@@ -41,7 +41,7 @@

func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, keyword string) ([]*model.SalesLeads, int64, int) {
    // get contact list
    contacts, total, err := model.NewSalesLeadsSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
    contacts, total, err := model.NewSalesLeadsSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
    if err != nil {
        return nil, 0, ecode.SalesLeadsListErr
    }
@@ -56,7 +56,7 @@
    //}

    // update salesLeads
    err := model.NewSalesLeadsSearch().SetIds(ids).UpdateMap(map[string]interface{}{
    err := model.NewSalesLeadsSearch(nil).SetIds(ids).UpdateMap(map[string]interface{}{
        "member_id": memberId,
    })
    if err != nil {
@@ -68,7 +68,7 @@

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