Merge branch 'hotfix'

zhangqian

2023-08-24 037900f7998925e0c8727338aef3a1b199daa898

 docs/swagger.yaml

@@ -270,6 +270,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 +451,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 +486,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 +508,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 +548,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 +751,8 @@
        $ref: '#/definitions/model.Quotation'
      quotationId:
        type: integer
      serviceContractStatus:
        $ref: '#/definitions/model.ServiceContractStatus'
      statusId:
        type: integer
      updated_at:
@@ -801,6 +835,8 @@
        $ref: '#/definitions/model.Contact'
      contact_id:
        type: integer
      contact_information:
        $ref: '#/definitions/model.ContactInformation'
      contact_information_id:
        type: integer
      content:
@@ -1122,6 +1158,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -1379,6 +1419,8 @@
        type: integer
      signTime:
        type: string
      updateTime:
        type: string
      wechatOrderStatus:
        $ref: '#/definitions/model.WechatOrderStatus'
      wechatOrderStatusId:
@@ -1481,6 +1523,8 @@
        allOf:
        - $ref: '#/definitions/constvar.RefundSourceType'
        description: 来源类型（1销售退货）
      updateTime:
        type: string
    type: object
  model.SalesReturn:
    properties:
@@ -1533,6 +1577,8 @@
        allOf:
        - $ref: '#/definitions/constvar.SalesReturnSourceType'
        description: 源单类型（1销售明细）
      updateTime:
        type: string
    type: object
  model.SalesReturnStatus:
    properties:
@@ -1634,6 +1680,10 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      endTime:
        type: string
      id:
@@ -1675,6 +1725,8 @@
      startTime:
        type: string
      terms:
        type: string
      updateTime:
        type: string
    type: object
  model.ServiceContractStatus:
@@ -1720,6 +1772,10 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      file:
        type: string
      id:
@@ -1756,6 +1812,8 @@
        $ref: '#/definitions/model.TimelyRate'
      timelyRateId:
        type: integer
      updateTime:
        type: string
    type: object
  model.ServiceOrder:
    properties:
@@ -1783,6 +1841,10 @@
      contactId:
        description: 联系人id
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      expectTime:
        description: 希望处理时间
        type: string
@@ -1833,6 +1895,10 @@
      serviceContractId:
        description: 服务合同id
        type: integer
      serviceMan:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 服务人员
      serviceManId:
        description: 服务人员
        type: integer
@@ -1865,6 +1931,8 @@
      timeSpentId:
        description: 花费时间
        type: integer
      updateTime:
        type: string
    type: object
  model.ServiceOrderStatus:
    properties:
@@ -2483,6 +2551,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -2799,10 +2871,10 @@
    type: object
  request.AddServiceContractStatus:
    properties:
      id:
        type: integer
      name:
        type: string
    required:
    - name
    type: object
  request.AddServiceContractType:
    properties:
@@ -3223,6 +3295,13 @@
          type: integer
        type: array
    type: object
  request.DeleteContract:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteCountry:
    properties:
      id:
@@ -3236,7 +3315,28 @@
          type: integer
        type: array
    type: object
  request.DeleteMasterOrder:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteOrderManage:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteQuotation:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteSaleChance:
    properties:
      ids:
        items:
@@ -3258,6 +3358,13 @@
        type: array
    type: object
  request.DeleteServiceFollowup:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteSubOrder:
    properties:
      ids:
        items:
@@ -3348,7 +3455,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:
@@ -3393,7 +3501,7 @@
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"topic": "跟进主题",
          "member_name": "跟进人", "client_name": "客户名称", "client_status": "客户状态", "follow_time":
          "跟进时间", "next_follow_time": "下次跟进时间", "record": "跟进记录", "phone": "联系人电话",
          "contact_name": "联系人姓名"}'
          "contact_name": "联系人姓名", "sales_leads_id": "销售线索id", "sale_chance_id": "销售机会id"}'
        type: object
    type: object
  request.GetMasterOrderList:
@@ -4537,6 +4645,10 @@
      bankAccountId:
        description: 账户id
        type: integer
      client:
        allOf:
        - $ref: '#/definitions/model.Client'
        description: 客户id
      clientId:
        description: 客户id
        type: integer
@@ -5007,18 +5119,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:
@@ -5887,13 +5987,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:
@@ -6924,14 +7017,15 @@
      summary: 添加合同
      tags:
      - Contract
  /api/contract/delete/{id}:
  /api/contract/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteContract'
      produces:
      - application/json
      responses:
@@ -8417,14 +8511,15 @@
      summary: 添加主订单
      tags:
      - MasterOrder
  /api/masterOrder/delete/{id}:
  /api/masterOrder/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteMasterOrder'
      produces:
      - application/json
      responses:
@@ -9162,14 +9257,15 @@
      summary: 添加报价单
      tags:
      - Quotation
  /api/quotation/delete/{id}:
  /api/quotation/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteQuotation'
      produces:
      - application/json
      responses:
@@ -9874,14 +9970,15 @@
      summary: 添加销售机会
      tags:
      - SaleChance
  /api/saleChance/delete/{id}:
  /api/saleChance/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteSaleChance'
      produces:
      - application/json
      responses:
@@ -10893,9 +10990,9 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 添加服务合同状态
      summary: 添加合同状态
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractStatus/delete/{id}:
    delete:
      parameters:
@@ -10911,11 +11008,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:
@@ -10923,14 +11046,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:
@@ -10939,7 +11064,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateServiceContractStatuss'
          $ref: '#/definitions/request.UpdateServiceContractStatus'
      produces:
      - application/json
      responses:
@@ -10947,9 +11072,9 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 更新服务合同状态
      summary: 更新合同状态
      tags:
      - ServiceContractStatus
      - 合同状态
  /api/serviceContractType/add:
    post:
      parameters:
@@ -11697,14 +11822,15 @@
      summary: 添加子订单
      tags:
      - SubOrder
  /api/subOrder/delete/{id}:
  /api/subOrder/delete:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        in: body
        name: object
        required: true
        type: integer
        schema:
          $ref: '#/definitions/request.DeleteSubOrder'
      produces:
      - application/json
      responses: