Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-30 5053e0347804728c63c5498e0aa18129822454cb

 docs/swagger.yaml

@@ -116,18 +116,6 @@
    type: string
    x-enum-varnames:
    - PaymentTypeQueryClassExpireLessThen60Days
  constvar.ReceiptKeywordType:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ReceiptKeywordCustomerName
  constvar.ReceiptQueryClass:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ReceiptQueryClassExpireLessThen60Days
  constvar.ReceiptSourceType:
    enum:
    - 1
@@ -136,6 +124,12 @@
    - 4
    - 5
    type: integer
    x-enum-comments:
      ReceiptSourceTypeChuKuDan: 出库单it
      ReceiptSourceTypeCollectionPlan: 收款计划
      ReceiptSourceTypeInvoice: 销售发票
      ReceiptSourceTypeSalesDetails: 销售明细单
      ReceiptSourceTypeServiceContract: 服务合同
    x-enum-varnames:
    - ReceiptSourceTypeSalesDetails
    - ReceiptSourceTypeServiceContract
@@ -270,6 +264,18 @@
    - ServiceContractQueryClassExpireAfter60Day
    - ServiceContractQueryClassExpiredBefore15Day
    - ServiceContractQueryClassExpiredBefore60Day
  constvar.ServiceContractStatusKeywordType:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ServiceContractStatusKeywordCustomerName
  constvar.ServiceContractStatusQueryClass:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ServiceContractStatusQueryClassExpireLessThen60Days
  constvar.ServiceFeeKeywordType:
    enum:
    - 客户名称
@@ -439,6 +445,11 @@
    type: object
  model.Client:
    properties:
      _:
        description: |-
          The date when the item was deleted
          example: 2023-08-10 15:48:25
        type: string
      business_scope:
        type: string
      city:
@@ -469,6 +480,13 @@
        $ref: '#/definitions/model.Country'
      country_id:
        type: integer
      created_at:
        description: |-
          The date when the item was created
          example: 2023-08-10 15:48:25
        type: string
      creator_id:
        type: integer
      detail_address:
        type: string
      enterprise_nature_id:
@@ -484,6 +502,9 @@
          $ref: '#/definitions/model.FollowRecord'
        type: array
      id:
        description: |-
          The ID of the item
          example: 1
        type: integer
      industry:
        $ref: '#/definitions/model.Industry'
@@ -521,6 +542,11 @@
        type: string
      service_member_id:
        type: integer
      updated_at:
        description: |-
          The date when the item was last updated
          example: 2023-08-10 15:48:25
        type: string
    type: object
  model.ClientLevel:
    properties:
@@ -719,6 +745,8 @@
        $ref: '#/definitions/model.Quotation'
      quotationId:
        type: integer
      serviceContractStatus:
        $ref: '#/definitions/model.ServiceContractStatus'
      statusId:
        type: integer
      updated_at:
@@ -801,6 +829,8 @@
        $ref: '#/definitions/model.Contact'
      contact_id:
        type: integer
      contact_information:
        $ref: '#/definitions/model.ContactInformation'
      contact_information_id:
        type: integer
      content:
@@ -1122,6 +1152,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -1379,6 +1413,8 @@
        type: integer
      signTime:
        type: string
      updateTime:
        type: string
      wechatOrderStatus:
        $ref: '#/definitions/model.WechatOrderStatus'
      wechatOrderStatusId:
@@ -1401,6 +1437,8 @@
      country_id:
        type: integer
      desc:
        type: string
      detail_address:
        type: string
      followRecord:
        items:
@@ -1435,6 +1473,8 @@
    type: object
  model.SalesRefund:
    properties:
      Source:
        $ref: '#/definitions/model.SalesReturn'
      amountTotal:
        description: 价税合计
        type: number
@@ -1481,6 +1521,8 @@
        allOf:
        - $ref: '#/definitions/constvar.RefundSourceType'
        description: 来源类型（1销售退货）
      updateTime:
        type: string
    type: object
  model.SalesReturn:
    properties:
@@ -1533,6 +1575,8 @@
        allOf:
        - $ref: '#/definitions/constvar.SalesReturnSourceType'
        description: 源单类型（1销售明细）
      updateTime:
        type: string
    type: object
  model.SalesReturnStatus:
    properties:
@@ -1586,6 +1630,10 @@
      percent:
        description: 比例
        type: number
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 收款负责人ID
      principalId:
        description: 收款负责人ID
        type: integer
@@ -1634,6 +1682,10 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      endTime:
        type: string
      id:
@@ -1675,6 +1727,8 @@
      startTime:
        type: string
      terms:
        type: string
      updateTime:
        type: string
    type: object
  model.ServiceContractStatus:
@@ -1720,6 +1774,10 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      file:
        type: string
      id:
@@ -1756,6 +1814,8 @@
        $ref: '#/definitions/model.TimelyRate'
      timelyRateId:
        type: integer
      updateTime:
        type: string
    type: object
  model.ServiceOrder:
    properties:
@@ -1783,6 +1843,10 @@
      contactId:
        description: 联系人id
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      expectTime:
        description: 希望处理时间
        type: string
@@ -1869,6 +1933,8 @@
      timeSpentId:
        description: 花费时间
        type: integer
      updateTime:
        type: string
    type: object
  model.ServiceOrderStatus:
    properties:
@@ -1995,10 +2061,16 @@
      MaterialMode:
        description: 物料类型
        type: string
      MaxInventory:
        description: 最大库存
        type: integer
      MinInventory:
        description: 安全库存
        type: integer
      Name:
        type: string
      Node:
        description: 备注
        type: string
      Number:
        type: string
@@ -2008,6 +2080,12 @@
      SalePrice:
        description: 销售价格
        type: number
      Specs:
        description: 规格
        type: string
      Type:
        description: 型号
        type: string
      Unit:
        type: string
    type: object
@@ -2487,6 +2565,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -2705,6 +2787,9 @@
      desc:
        description: 备注
        type: string
      detail_address:
        description: 详细地址
        type: string
      member_id:
        description: 销售负责人ID
        type: integer
@@ -2786,6 +2871,10 @@
        type: integer
      salesDetailsId:
        type: integer
      serviceContractStatusId:
        type: integer
      serviceContractTypeId:
        type: integer
      serviceTimes:
        type: integer
      signTime:
@@ -2803,10 +2892,10 @@
    type: object
  request.AddServiceContractStatus:
    properties:
      id:
        type: integer
      name:
        type: string
    required:
    - name
    type: object
  request.AddServiceContractType:
    properties:
@@ -3372,7 +3461,9 @@
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称",
          "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name":
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别"}'
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别","representative":
          "法定代表人", "registration_time": "注册时间", "business_scope": "经营范围", "remark":
          "备注", "not_admin":"1:我的客户; 2:admin客户"}'
        type: object
    type: object
  request.GetContactList:
@@ -3387,7 +3478,8 @@
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称",
          "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name":
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别", "is_first": "是否是首要联系人"}'
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别", "is_first": "是否是首要联系人",
          "client_id": "clientId 用于返回首要联系人"}'
        type: object
    type: object
  request.GetContractList:
@@ -4576,6 +4668,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -4859,6 +4955,9 @@
      desc:
        description: 备注
        type: string
      detail_address:
        description: 详细地址
        type: string
      id:
        type: integer
      member_id:
@@ -4978,6 +5077,10 @@
      percent:
        description: 比例
        type: number
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 收款负责人ID
      principalId:
        description: 收款负责人ID
        type: integer
@@ -5025,6 +5128,10 @@
        type: integer
      salesDetailsId:
        type: integer
      serviceContractStatusId:
        type: integer
      serviceContractTypeId:
        type: integer
      serviceTimes:
        type: integer
      signTime:
@@ -5046,18 +5153,6 @@
        type: integer
      name:
        type: string
    required:
    - id
    - name
    type: object
  request.UpdateServiceContractStatuss:
    properties:
      service_contract_status:
        items:
          $ref: '#/definitions/request.UpdateServiceContractStatus'
        type: array
    required:
    - service_contract_status
    type: object
  request.UpdateServiceContractType:
    properties:
@@ -5926,13 +6021,6 @@
      list:
        items:
          $ref: '#/definitions/model.Satisfaction'
        type: array
    type: object
  response.ServiceContractStatusResponse:
    properties:
      list:
        items:
          $ref: '#/definitions/model.ServiceContractStatus'
        type: array
    type: object
  response.ServiceContractTypeResponse:
@@ -9378,16 +9466,6 @@
  /api/receipt/list:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      - enum:
        - ""
        in: query
        name: keywordType
        type: string
        x-enum-varnames:
        - ReceiptKeywordCustomerName
      - description: 页码
        in: query
        name: page
@@ -9396,13 +9474,30 @@
        in: query
        name: pageSize
        type: integer
      - in: query
        name: sourceId
        type: integer
      - enum:
        - ""
        - 1
        - 2
        - 3
        - 4
        - 5
        in: query
        name: queryClass
        type: string
        name: sourceType
        type: integer
        x-enum-comments:
          ReceiptSourceTypeChuKuDan: 出库单it
          ReceiptSourceTypeCollectionPlan: 收款计划
          ReceiptSourceTypeInvoice: 销售发票
          ReceiptSourceTypeSalesDetails: 销售明细单
          ReceiptSourceTypeServiceContract: 服务合同
        x-enum-varnames:
        - ReceiptQueryClassExpireLessThen60Days
        - ReceiptSourceTypeSalesDetails
        - ReceiptSourceTypeServiceContract
        - ReceiptSourceTypeInvoice
        - ReceiptSourceTypeCollectionPlan
        - ReceiptSourceTypeChuKuDan
      produces:
      - application/json
      responses:
@@ -10158,7 +10253,12 @@
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/request.AddSalesDetails'
              type: object
      summary: 添加销售明细
      tags:
      - SalesDetails
@@ -10799,10 +10899,23 @@
  /api/serviceCollectionPlan/list:
    get:
      parameters:
      - description: 服务合同id
        in: query
        name: serviceContractId
      - in: query
        name: sourceId
        required: true
        type: integer
      - enum:
        - 1
        - 2
        in: query
        name: sourceType
        required: true
        type: integer
        x-enum-comments:
          CollectionSourceTypeSaleDetails: 销售明细
          CollectionSourceTypeServiceContract: 服务合同
        x-enum-varnames:
        - CollectionSourceTypeSaleDetails
        - CollectionSourceTypeServiceContract
      produces:
      - application/json
      responses:
@@ -10936,9 +11049,9 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 添加服务合同状态
      summary: 添加合同状态
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractStatus/delete/{id}:
    delete:
      parameters:
@@ -10954,11 +11067,37 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 删除服务合同状态
      summary: 删除合同状态
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractStatus/list:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      - enum:
        - ""
        in: query
        name: keywordType
        type: string
        x-enum-varnames:
        - ServiceContractStatusKeywordCustomerName
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      - enum:
        - ""
        in: query
        name: queryClass
        type: string
        x-enum-varnames:
        - ServiceContractStatusQueryClassExpireLessThen60Days
      produces:
      - application/json
      responses:
@@ -10966,14 +11105,16 @@
          description: OK
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - $ref: '#/definitions/response.ListResponse'
            - properties:
                data:
                  $ref: '#/definitions/response.ServiceContractStatusResponse'
                  items:
                    $ref: '#/definitions/model.ServiceContractStatus'
                  type: array
              type: object
      summary: 获取服务合同状态列表
      summary: 获取合同状态列表
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractStatus/update:
    put:
      parameters:
@@ -10982,7 +11123,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateServiceContractStatuss'
          $ref: '#/definitions/request.UpdateServiceContractStatus'
      produces:
      - application/json
      responses:
@@ -10990,9 +11131,9 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 更新服务合同状态
      summary: 更新合同状态
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractType/add:
    post:
      parameters: