add

wangpengfei

2023-07-20 a63566fef15a499c82a5198578d5cb99fca299d4

add

add vetting

 api/v1/index.go

@@ -48,6 +48,7 @@
    MenuApi
    GetAllDataApi
    DepartmentApi
    VettingApi
}

var ApiGroup = new(Group)
@@ -96,4 +97,5 @@
    menuService                 = service.ServiceGroup.MenuService
    allDataServer               = service.ServiceGroup.DataServer
    departmentService           = service.ServiceGroup.DepartmentService
    vettingService              = service.ServiceGroup.VettingService
)

 api/v1/vetting.go

@@ -1,8 +1,10 @@
package v1

import (
    "aps_crm/model"
    "aps_crm/model/request"
    "aps_crm/pkg/contextx"
    "aps_crm/pkg/ecode"
    "github.com/gin-gonic/gin"
)

@@ -23,19 +25,31 @@
        return
    }

    //errCode, vetting := checkVettingParams(params.Vetting)
    //if errCode != ecode.OK {
    //    ctx.Fail(errCode)
    //    return
    //}
    //
    //// check member exist
    //
    //errCode = vettingService.AddVetting(vetting)
    //if errCode != ecode.OK {
    //    ctx.Fail(errCode)
    //    return
    //}
    errCode, vetting := checkVettingParams(&params)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    // check member exist

    errCode = vettingService.AddVetting(vetting)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.Ok()
}

func checkVettingParams(vetting *request.AddVetting) (int, *model.Vetting) {

    v := &model.Vetting{
        Opinion:   vetting.Opinion,
        Status:    vetting.Status,
        UserId:    vetting.UserId,
        VettingId: vetting.VettingId,
    }

    return ecode.OK, v
}

 constvar/const.go

@@ -58,3 +58,12 @@
const (
    MenuTypeClient MenuType = "client"
)

type VettingType int

const (
    VettingTypeClient VettingType = iota + 1
    VettingTypeSales
    VettingTypeSalesChance
    VettingTypeSalesChanceFollow
)

 docs/docs.go

@@ -4013,7 +4013,7 @@
                }
            }
        },
        "/api/salesReturn/update/{id}": {
        "/api/salesReturn/update": {
            "put": {
                "produces": [
                    "application/json"
@@ -6758,7 +6758,7 @@
                    "type": "integer"
                },
                "money": {
                    "type": "string"
                    "type": "number"
                },
                "number": {
                    "type": "string"
@@ -8367,7 +8367,7 @@
                    "type": "integer"
                },
                "money": {
                    "type": "string"
                    "type": "number"
                },
                "number": {
                    "type": "string"
@@ -8837,35 +8837,11 @@
        "request.UpdateSalesReturnRequest": {
            "type": "object",
            "properties": {
                "clientId": {
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "memberId": {
                    "type": "integer"
                },
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "reason": {
                    "type": "string"
                },
                "repository": {
                    "type": "string"
                },
                "returnDate": {
                    "type": "string"
                },
                "status": {
                    "type": "integer"
                "salesReturn": {
                    "$ref": "#/definitions/request.SalesReturn"
                }
            }
        },

 docs/swagger.json

@@ -4001,7 +4001,7 @@
                }
            }
        },
        "/api/salesReturn/update/{id}": {
        "/api/salesReturn/update": {
            "put": {
                "produces": [
                    "application/json"
@@ -6746,7 +6746,7 @@
                    "type": "integer"
                },
                "money": {
                    "type": "string"
                    "type": "number"
                },
                "number": {
                    "type": "string"
@@ -8355,7 +8355,7 @@
                    "type": "integer"
                },
                "money": {
                    "type": "string"
                    "type": "number"
                },
                "number": {
                    "type": "string"
@@ -8825,35 +8825,11 @@
        "request.UpdateSalesReturnRequest": {
            "type": "object",
            "properties": {
                "clientId": {
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "memberId": {
                    "type": "integer"
                },
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "reason": {
                    "type": "string"
                },
                "repository": {
                    "type": "string"
                },
                "returnDate": {
                    "type": "string"
                },
                "status": {
                    "type": "integer"
                "salesReturn": {
                    "$ref": "#/definitions/request.SalesReturn"
                }
            }
        },

 docs/swagger.yaml

@@ -1157,7 +1157,7 @@
      member_id:
        type: integer
      money:
        type: string
        type: number
      number:
        type: string
      start_time:
@@ -2249,7 +2249,7 @@
      member_id:
        type: integer
      money:
        type: string
        type: number
      number:
        type: string
      start_time:
@@ -2561,26 +2561,10 @@
    type: object
  request.UpdateSalesReturnRequest:
    properties:
      clientId:
        type: integer
      id:
        type: integer
      memberId:
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      reason:
        type: string
      repository:
        type: string
      returnDate:
        type: string
      status:
        type: integer
      salesReturn:
        $ref: '#/definitions/request.SalesReturn'
    type: object
  request.UpdateSalesSources:
    properties:
@@ -5530,7 +5514,7 @@
      summary: 获取销售退货列表
      tags:
      - SalesReturn
  /api/salesReturn/update/{id}:
  /api/salesReturn/update:
    put:
      parameters:
      - description: 查询参数

 pkg/ecode/code.go

@@ -289,4 +289,7 @@

    VettingExist    = 4100001 // 审批已存在
    VettingNotExist = 4100002 // 审批不存在
    VettingListErr  = 4100003 // 获取审批列表失败
    VettingSetErr   = 4100004 // 设置审批失败

)

 service/index.go

@@ -44,6 +44,7 @@
    MenuService
    DataServer
    DepartmentService
    VettingService
}

var ServiceGroup = new(Group)

 service/vetting.go

@@ -5,12 +5,20 @@
    "aps_crm/pkg/ecode"
)

type Vettingservice struct{}
type VettingService struct{}

func (Vettingservice) AddVetting(vetting *model.Vetting) int {
func (VettingService) AddVetting(vetting *model.Vetting) int {
    err := model.NewVettingSearch().Create(vetting)
    if err != nil {
        return ecode.VettingExist
    }
    return ecode.OK
}

func (VettingService) UpdateVetting(vetting *model.Vetting) int {
    err := model.NewVettingSearch().Update(vetting)
    if err != nil {
        return ecode.VettingExist
    }
    return ecode.OK
}