fix

wangpengfei

2023-08-15 a86df1054649f0594e4c77174fd254b8abd800ca

 docs/swagger.yaml

@@ -142,6 +142,14 @@
    - ReceiptSourceTypeInvoice
    - ReceiptSourceTypeCollectionPlan
    - ReceiptSourceTypeChuKuDan
  constvar.RefundSourceType:
    enum:
    - 1
    type: integer
    x-enum-comments:
      RefundSourceTypeSalesReturn: 销售退货
    x-enum-varnames:
    - RefundSourceTypeSalesReturn
  constvar.SalesDetailsKeywordType:
    enum:
    - 客户名称
@@ -156,6 +164,28 @@
    - SalesDetailsKeywordTypeSignTime
    - SalesDetailsKeywordTypePrincipal
    - SalesDetailsKeywordTypeProductName
  constvar.SalesRefundKeywordType:
    enum:
    - 销售退货单编号
    - 客户名称
    - 退款日期
    - 账户
    - 是否开票
    - 付款方式
    - 销售负责人
    - 修改时间
    - 价税合计
    type: string
    x-enum-varnames:
    - SalesRefundKeywordRefundNumber
    - SalesRefundKeywordClientName
    - SalesRefundKeywordRefundDate
    - SalesRefundKeywordAccount
    - SalesRefundKeywordIsInvoice
    - SalesRefundKeywordPaymentType
    - SalesRefundKeywordPrincipal
    - SalesRefundKeywordUpdateAt
    - SalesRefundKeywordPriceTotal
  constvar.SalesReturnSourceType:
    enum:
    - 1
@@ -500,6 +530,39 @@
      name:
        type: string
    type: object
  model.CollectionProjection:
    properties:
      _:
        description: |-
          The date when the item was deleted
          example: 2023-08-10 15:48:25
        type: string
      created_at:
        description: |-
          The date when the item was created
          example: 2023-08-10 15:48:25
        type: string
      creator:
        type: integer
      estimated_collection_amount:
        type: number
      estimated_collection_date:
        type: string
      id:
        description: |-
          The ID of the item
          example: 1
        type: integer
      modifier:
        type: integer
      sale_chance_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.Contact:
    properties:
      birthday:
@@ -522,6 +585,8 @@
        type: integer
      is_first:
        type: boolean
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      name:
@@ -571,6 +636,8 @@
        type: integer
      is_first:
        type: boolean
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      name:
@@ -594,12 +661,29 @@
    type: object
  model.Contract:
    properties:
      _:
        description: |-
          The date when the item was deleted
          example: 2023-08-10 15:48:25
        type: string
      client:
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      created_at:
        description: |-
          The date when the item was created
          example: 2023-08-10 15:48:25
        type: string
      file:
        type: string
      id:
        description: |-
          The ID of the item
          example: 1
        type: integer
      member:
        $ref: '#/definitions/model.User'
      memberId:
        type: integer
      number:
@@ -610,6 +694,11 @@
        type: integer
      statusId:
        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.Country:
    properties:
@@ -635,23 +724,6 @@
        type: integer
      name:
        type: string
    type: object
  model.CustomerServiceSheet:
    properties:
      handleStatus:
        type: integer
      id:
        type: integer
      memberId:
        type: integer
      number:
        type: string
      priority:
        type: integer
      serviceFollowupId:
        type: integer
      serviceMode:
        type: integer
    type: object
  model.Department:
    properties:
@@ -694,6 +766,8 @@
        $ref: '#/definitions/model.Client'
      client_id:
        type: integer
      client_status:
        $ref: '#/definitions/model.ClientStatus'
      client_status_id:
        type: integer
      contact:
@@ -720,8 +794,12 @@
        type: string
      record:
        type: string
      sale_chance:
        $ref: '#/definitions/model.SaleChance'
      sale_chance_id:
        type: integer
      sales_leads:
        $ref: '#/definitions/model.SalesLeads'
      sales_leads_id:
        type: integer
      topic:
@@ -826,6 +904,8 @@
        type: string
      id:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      money:
@@ -977,10 +1057,18 @@
        type: string
      id:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status:
        $ref: '#/definitions/model.QuotationStatus'
      quotation_status_id:
        type: integer
      sale_chance:
@@ -1002,6 +1090,8 @@
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -1016,9 +1106,15 @@
      moneyType:
        description: 币种
        type: string
      paymentType:
        $ref: '#/definitions/model.PaymentType'
      paymentTypeId:
        description: 收款方式ID
        type: integer
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 负责人id
      principalId:
        description: 负责人id
        type: integer
@@ -1094,6 +1190,10 @@
        $ref: '#/definitions/model.Client'
      client_id:
        type: integer
      collection_projections:
        items:
          $ref: '#/definitions/model.CollectionProjection'
        type: array
      competitors:
        type: string
      contact:
@@ -1118,6 +1218,8 @@
        type: string
      key_maker:
        type: string
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      name:
@@ -1130,6 +1232,8 @@
        type: string
      possibilities_id:
        type: integer
      possibility:
        $ref: '#/definitions/model.Possibility'
      process:
        type: string
      projected_amount:
@@ -1142,18 +1246,24 @@
        $ref: '#/definitions/model.Region'
      region_id:
        type: integer
      regular_customers:
        $ref: '#/definitions/model.RegularCustomers'
      regular_customers_id:
        type: integer
      remark:
        type: string
      sale_stage:
        $ref: '#/definitions/model.SaleStage'
      sale_stage_id:
        type: integer
      sale_type:
        $ref: '#/definitions/model.SaleType'
      sale_type_id:
        type: integer
      sales_sources:
        $ref: '#/definitions/model.SalesSources'
      sales_sources_id:
        type: integer
      salesSources:
        $ref: '#/definitions/model.SalesSources'
      solutions:
        type: string
      status_id:
@@ -1287,6 +1397,8 @@
        $ref: '#/definitions/model.Region'
      region_id:
        type: integer
      sales_sources:
        $ref: '#/definitions/model.SalesSources'
      sales_sources_id:
        type: integer
      sales_status:
@@ -1294,18 +1406,37 @@
    type: object
  model.SalesRefund:
    properties:
      accountId:
      amountTotal:
        description: 价税合计
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
      client:
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      id:
        type: integer
      isInvoice:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      memberId:
        type: integer
      number:
        type: string
      paymentType:
        $ref: '#/definitions/model.PaymentType'
      paymentTypeId:
        description: 收款方式ID
        type: integer
      products:
        items:
          $ref: '#/definitions/model.Product'
@@ -1314,8 +1445,13 @@
        type: string
      refundDate:
        type: string
      refundMethod:
        type: string
      sourceId:
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.RefundSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
    type: object
  model.SalesReturn:
    properties:
@@ -1547,8 +1683,6 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      customerServiceSheet:
        $ref: '#/definitions/model.CustomerServiceSheet'
      file:
        type: string
      id:
@@ -1573,10 +1707,10 @@
        $ref: '#/definitions/model.Satisfaction'
      satisfactionId:
        type: integer
      serviceId:
        type: integer
      serviceOrder:
        $ref: '#/definitions/model.ServiceOrder'
      serviceOrderId:
        type: integer
      solveRate:
        $ref: '#/definitions/model.SolveRate'
      solveRateId:
@@ -1612,11 +1746,6 @@
      contactId:
        description: 联系人id
        type: integer
      contract:
        $ref: '#/definitions/model.Contract'
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -1632,11 +1761,6 @@
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      orderManage:
        $ref: '#/definitions/model.OrderManage'
      priorityLevel:
        $ref: '#/definitions/model.PriorityLevel'
      priorityLevelId:
@@ -1660,6 +1784,16 @@
        $ref: '#/definitions/model.SaleChance'
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetails:
        $ref: '#/definitions/model.SalesDetails'
      salesDetailsId:
        description: 销售明细id
        type: integer
      serviceContract:
        $ref: '#/definitions/model.ServiceContract'
      serviceContractId:
        description: 服务合同id
        type: integer
      serviceManId:
        description: 服务人员
@@ -1737,8 +1871,12 @@
        type: integer
      id:
        type: integer
      masterOrder:
        $ref: '#/definitions/model.MasterOrder'
      masterOrderId:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      memberId:
        type: integer
      number:
@@ -1955,6 +2093,18 @@
        type: string
    required:
    - name
    type: object
  request.AddCollectionProjection:
    properties:
      estimated_collection_amount:
        description: 预计收款金额
        type: number
      estimated_collection_time:
        description: 预计收款时间
        type: string
      sale_chance_id:
        description: 销售机会id
        type: integer
    type: object
  request.AddContact:
    properties:
@@ -2264,6 +2414,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -2283,6 +2437,8 @@
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -2297,9 +2453,15 @@
      moneyType:
        description: 币种
        type: string
      paymentType:
        $ref: '#/definitions/model.PaymentType'
      paymentTypeId:
        description: 收款方式ID
        type: integer
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 负责人id
      principalId:
        description: 负责人id
        type: integer
@@ -2707,7 +2869,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -2734,9 +2896,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -2745,9 +2904,6 @@
        type: integer
      faultTypeId:
        description: 故障类别id
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -2767,12 +2923,21 @@
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetailsId:
        description: 销售订单id
        type: integer
      serviceContractId:
        description: 合同id
        type: integer
      serviceManId:
        description: 服务人员
        type: integer
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -2785,9 +2950,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -3137,14 +3299,17 @@
    type: object
  request.GetContractList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{} {"member_name": "销售负责人", "number":
          "合同编号", "created_at": "创建时间"}'
        type: object
    type: object
  request.GetFaqList:
    properties:
@@ -3179,14 +3344,18 @@
    type: object
  request.GetMasterOrderList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"number": "销售总单号",
          "client_name": "客户名称", "member_name": "销售负责人", "start_time": "开始时间", "end_time":
          "结束时间", "money": "总金额", "member_name": "负责人"}'
        type: object
    type: object
  request.GetOrderManageList:
    properties:
@@ -3212,25 +3381,34 @@
    type: object
  request.GetQuotationList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      searchMap:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
          销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人",
          "validity_date": "有效期"}'
        type: object
    type: object
  request.GetSaleChanceList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "机会名称",
          "client_name": "客户名称","number":"编号", "contact_name":"联系人姓名", "member_name":
          "销售负责人", "status": "状态", "sale_stage": "阶段", "possibilities": "可能性", "expected_time":
          "预计成交时间", "budget": "资金绝对值", "projected_amount": "预计合同金额"}'
        type: object
    type: object
  request.GetSalesDetailsList:
    properties:
@@ -3264,6 +3442,8 @@
    properties:
      keyword:
        type: string
      keywordType:
        $ref: '#/definitions/constvar.SalesRefundKeywordType'
      page:
        description: 页码
        type: integer
@@ -3324,6 +3504,9 @@
      pageSize:
        description: 每页大小
        type: integer
      serviceOrderId:
        description: 服务回访单id
        type: integer
    type: object
  request.GetServiceOrderList:
    properties:
@@ -3339,17 +3522,25 @@
        type: integer
      queryClass:
        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
      salesDetailsId:
        type: integer
      serviceContractId:
        type: integer
    type: object
  request.GetSubOrderList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"number": "销售子单号",
          "client_name": "客户名称", "master_order_number": "销售总单号", "member_name": "销售负责人",
          "master_order_id": "销售总单id"}'
        type: object
    type: object
  request.GetUserList:
    properties:
@@ -3398,6 +3589,16 @@
        type: string
      subOrderId:
        type: integer
    type: object
  request.PushSaleChance:
    properties:
      id:
        type: integer
      step:
        type: integer
    required:
    - id
    - step
    type: object
  request.PushSalesLeads:
    properties:
@@ -3482,7 +3683,8 @@
    type: object
  request.SalesRefund:
    properties:
      accountId:
      bankAccountId:
        description: 账户id
        type: integer
      clientId:
        type: integer
@@ -3492,6 +3694,9 @@
        type: integer
      number:
        type: string
      paymentTypeId:
        description: 收款方式ID
        type: integer
      products:
        items:
          $ref: '#/definitions/model.Product'
@@ -3500,8 +3705,13 @@
        type: string
      refundDate:
        type: string
      refundMethod:
        type: string
      sourceId:
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.RefundSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
    type: object
  request.SalesReturn:
    properties:
@@ -3768,6 +3978,17 @@
        type: array
    required:
    - client_types
    type: object
  request.UpdateCollectionProjection:
    properties:
      estimated_collection_amount:
        description: 预计收款金额
        type: number
      estimated_collection_time:
        description: 预计收款时间
        type: string
      id:
        type: integer
    type: object
  request.UpdateContact:
    properties:
@@ -4214,6 +4435,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -4245,6 +4470,8 @@
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -4259,9 +4486,15 @@
      moneyType:
        description: 币种
        type: string
      paymentType:
        $ref: '#/definitions/model.PaymentType'
      paymentTypeId:
        description: 收款方式ID
        type: integer
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 负责人id
      principalId:
        description: 负责人id
        type: integer
@@ -4845,7 +5078,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -4872,9 +5105,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -4885,9 +5115,6 @@
        description: 故障类别id
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -4907,12 +5134,21 @@
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetailsId:
        description: 销售订单id
        type: integer
      serviceContractId:
        description: 合同id
        type: integer
      serviceManId:
        description: 服务人员
        type: integer
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -4925,9 +5161,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -6403,6 +6636,83 @@
      summary: 更新客户类型
      tags:
      - ClientType
  /api/collectionProjection/add:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddCollectionProjection'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 添加收款预测
      tags:
      - CollectionProjection
  /api/collectionProjection/delete/{id}:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        required: true
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 删除收款预测
      tags:
      - CollectionProjection
  /api/collectionProjection/list:
    post:
      parameters:
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 获取收款预测列表
      tags:
      - CollectionProjection
  /api/collectionProjection/update:
    put:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateCollectionProjection'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 更新收款预测
      tags:
      - CollectionProjection
  /api/contact/add:
    post:
      parameters:
@@ -9495,6 +9805,25 @@
      summary: 销售机会列表
      tags:
      - SaleChance
  /api/saleChance/push:
    put:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.PushSaleChance'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 推进销售机会
      tags:
      - SaleChance
  /api/saleChance/update:
    put:
      parameters: