fix

wangpengfei

2023-07-20 8f1672bf14ce3ead7998a8259c0cab22405aa958

fix

Modify the client module when adding and changing contracts

 api/v1/serviceFeeManage.go

@@ -145,7 +145,6 @@
    }

    result = model.ServiceFeeManage{
        ClientId:   serviceFeeManage.ClientId,
        MemberId:   serviceFeeManage.MemberId,
        Remark:     serviceFeeManage.Remark,
        LatestDate: t,

 api/v1/serviceFollowup.go

@@ -87,6 +87,8 @@
        return
    }

    serviceFollowup.Id = params.Id

    errCode = serviceFollowupService.UpdateServiceFollowup(&serviceFollowup)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 docs/docs.go

@@ -7160,20 +7160,102 @@
        "request.AddServiceFeeManage": {
            "type": "object",
            "properties": {
                "client_id": {
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "file": {
                    "type": "string"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_date": {
                    "type": "string"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "description": "销售负责人ID",
                    "type": "integer"
                },
                "remark": {
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },
@@ -7334,102 +7416,6 @@
                "pos": {
                    "description": "用户岗位",
                    "type": "string"
                }
            }
        },
        "request.Client": {
            "type": "object",
            "properties": {
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "description": "销售负责人ID",
                    "type": "integer"
                },
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },
@@ -8933,10 +8919,45 @@
        "request.UpdateServiceFeeManage": {
            "type": "object",
            "properties": {
                "client": {
                    "$ref": "#/definitions/request.Client"
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "client_id": {
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "file": {
@@ -8945,14 +8966,56 @@
                "id": {
                    "type": "integer"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_date": {
                    "type": "string"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "type": "integer"
                },
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },

 docs/swagger.json

@@ -7148,20 +7148,102 @@
        "request.AddServiceFeeManage": {
            "type": "object",
            "properties": {
                "client_id": {
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "file": {
                    "type": "string"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_date": {
                    "type": "string"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "description": "销售负责人ID",
                    "type": "integer"
                },
                "remark": {
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },
@@ -7322,102 +7404,6 @@
                "pos": {
                    "description": "用户岗位",
                    "type": "string"
                }
            }
        },
        "request.Client": {
            "type": "object",
            "properties": {
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "description": "销售负责人ID",
                    "type": "integer"
                },
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },
@@ -8921,10 +8907,45 @@
        "request.UpdateServiceFeeManage": {
            "type": "object",
            "properties": {
                "client": {
                    "$ref": "#/definitions/request.Client"
                "business_scope": {
                    "description": "经营范围",
                    "type": "string"
                },
                "client_id": {
                "city_id": {
                    "type": "integer"
                },
                "client_level_id": {
                    "description": "客户等级ID",
                    "type": "integer"
                },
                "client_origin_id": {
                    "description": "客户来源ID",
                    "type": "integer"
                },
                "client_status_id": {
                    "description": "客户状态ID",
                    "type": "integer"
                },
                "client_type_id": {
                    "description": "客户类型ID",
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/request.Contact"
                },
                "country_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "description": "详细地址",
                    "type": "string"
                },
                "enterprise_nature_id": {
                    "description": "企业性质",
                    "type": "integer"
                },
                "enterprise_scale_id": {
                    "description": "企业规模",
                    "type": "integer"
                },
                "file": {
@@ -8933,14 +8954,56 @@
                "id": {
                    "type": "integer"
                },
                "industry_id": {
                    "description": "所属行业",
                    "type": "integer"
                },
                "latest_date": {
                    "type": "string"
                },
                "latest_service_time": {
                    "description": "最晚服务时间",
                    "type": "string"
                },
                "member_id": {
                    "type": "integer"
                },
                "name": {
                    "description": "公司名称",
                    "type": "string"
                },
                "next_visit_time": {
                    "description": "下次回访时间",
                    "type": "string"
                },
                "number": {
                    "description": "公司编号",
                    "type": "string"
                },
                "province_id": {
                    "type": "integer"
                },
                "region_id": {
                    "type": "integer"
                },
                "registered_capital_id": {
                    "description": "注册资金",
                    "type": "integer"
                },
                "registration_time": {
                    "description": "注册时间",
                    "type": "string"
                },
                "remark": {
                    "type": "string"
                },
                "representative": {
                    "description": "法人代表",
                    "type": "string"
                },
                "service_member_id": {
                    "description": "服务负责人ID",
                    "type": "integer"
                }
            }
        },

 docs/swagger.yaml

@@ -1422,16 +1422,77 @@
    type: object
  request.AddServiceFeeManage:
    properties:
      client_id:
      business_scope:
        description: 经营范围
        type: string
      city_id:
        type: integer
      client_level_id:
        description: 客户等级ID
        type: integer
      client_origin_id:
        description: 客户来源ID
        type: integer
      client_status_id:
        description: 客户状态ID
        type: integer
      client_type_id:
        description: 客户类型ID
        type: integer
      contact:
        $ref: '#/definitions/request.Contact'
      country_id:
        type: integer
      detail_address:
        description: 详细地址
        type: string
      enterprise_nature_id:
        description: 企业性质
        type: integer
      enterprise_scale_id:
        description: 企业规模
        type: integer
      file:
        type: string
      industry_id:
        description: 所属行业
        type: integer
      latest_date:
        type: string
      member_id:
        type: integer
      remark:
      latest_service_time:
        description: 最晚服务时间
        type: string
      member_id:
        description: 销售负责人ID
        type: integer
      name:
        description: 公司名称
        type: string
      next_visit_time:
        description: 下次回访时间
        type: string
      number:
        description: 公司编号
        type: string
      province_id:
        type: integer
      region_id:
        type: integer
      registered_capital_id:
        description: 注册资金
        type: integer
      registration_time:
        description: 注册时间
        type: string
      remark:
        description: 备注
        type: string
      representative:
        description: 法人代表
        type: string
      service_member_id:
        description: 服务负责人ID
        type: integer
    type: object
  request.AddServiceFollowup:
    properties:
@@ -1541,76 +1602,6 @@
      pos:
        description: 用户岗位
        type: string
    type: object
  request.Client:
    properties:
      business_scope:
        description: 经营范围
        type: string
      city_id:
        type: integer
      client_level_id:
        description: 客户等级ID
        type: integer
      client_origin_id:
        description: 客户来源ID
        type: integer
      client_status_id:
        description: 客户状态ID
        type: integer
      client_type_id:
        description: 客户类型ID
        type: integer
      contact:
        $ref: '#/definitions/request.Contact'
      country_id:
        type: integer
      detail_address:
        description: 详细地址
        type: string
      enterprise_nature_id:
        description: 企业性质
        type: integer
      enterprise_scale_id:
        description: 企业规模
        type: integer
      industry_id:
        description: 所属行业
        type: integer
      latest_service_time:
        description: 最晚服务时间
        type: string
      member_id:
        description: 销售负责人ID
        type: integer
      name:
        description: 公司名称
        type: string
      next_visit_time:
        description: 下次回访时间
        type: string
      number:
        description: 公司编号
        type: string
      province_id:
        type: integer
      region_id:
        type: integer
      registered_capital_id:
        description: 注册资金
        type: integer
      registration_time:
        description: 注册时间
        type: string
      remark:
        description: 备注
        type: string
      representative:
        description: 法人代表
        type: string
      service_member_id:
        description: 服务负责人ID
        type: integer
    type: object
  request.Contact:
    properties:
@@ -2624,20 +2615,77 @@
    type: object
  request.UpdateServiceFeeManage:
    properties:
      client:
        $ref: '#/definitions/request.Client'
      client_id:
      business_scope:
        description: 经营范围
        type: string
      city_id:
        type: integer
      client_level_id:
        description: 客户等级ID
        type: integer
      client_origin_id:
        description: 客户来源ID
        type: integer
      client_status_id:
        description: 客户状态ID
        type: integer
      client_type_id:
        description: 客户类型ID
        type: integer
      contact:
        $ref: '#/definitions/request.Contact'
      country_id:
        type: integer
      detail_address:
        description: 详细地址
        type: string
      enterprise_nature_id:
        description: 企业性质
        type: integer
      enterprise_scale_id:
        description: 企业规模
        type: integer
      file:
        type: string
      id:
        type: integer
      industry_id:
        description: 所属行业
        type: integer
      latest_date:
        type: string
      latest_service_time:
        description: 最晚服务时间
        type: string
      member_id:
        type: integer
      name:
        description: 公司名称
        type: string
      next_visit_time:
        description: 下次回访时间
        type: string
      number:
        description: 公司编号
        type: string
      province_id:
        type: integer
      region_id:
        type: integer
      registered_capital_id:
        description: 注册资金
        type: integer
      registration_time:
        description: 注册时间
        type: string
      remark:
        type: string
      representative:
        description: 法人代表
        type: string
      service_member_id:
        description: 服务负责人ID
        type: integer
    type: object
  request.UpdateServiceFollowup:
    properties:

 model/request/serviceFeeManage.go

@@ -2,10 +2,10 @@

type AddServiceFeeManage struct {
    ServiceFeeManage
    Client
}

type ServiceFeeManage struct {
    ClientId   int    `json:"client_id"`
    MemberId   int    `json:"member_id"`
    LatestDate string `json:"latest_date"`
    Remark     string `json:"remark"`
@@ -13,7 +13,7 @@
}

type UpdateServiceFeeManage struct {
    Id     int    `json:"id"`
    Client Client `json:"client"`
    Id int `json:"id"`
    Client
    ServiceFeeManage
}

 service/serviceFeeManage.go

@@ -8,11 +8,24 @@
type FeeManageService struct{}

func (FeeManageService) AddServiceFeeManage(serviceFeeManage *model.ServiceFeeManage) int {
    err := model.NewServiceFeeManageSearch(nil).Create(serviceFeeManage)

    tx := model.NewContactSearch().Orm.Begin()

    err := model.NewClientSearch(tx).Create(serviceFeeManage.Client)
    if err != nil {
        tx.Rollback()
        return ecode.ClientExist
    }

    serviceFeeManage.ClientId = serviceFeeManage.Client.Id
    err = model.NewServiceFeeManageSearch(tx).Create(serviceFeeManage)
    if err != nil {
        tx.Rollback()
        return ecode.ServiceFeeManageExist
    }

    tx.Commit()

    return ecode.OK
}