Merge branch 'master' into fly

wangpengfei

2023-08-14 f84d9c46574a2cd663105859035bc17891270923

 docs/swagger.yaml

@@ -164,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
@@ -508,6 +530,39 @@
      name:
        type: string
    type: object
  model.CollectionProjection:
    properties:
      created_at:
        description: |-
          The date when the item was created
          example: 2023-08-10 15:48:25
        type: string
      creator:
        type: integer
      deleted_at:
        description: |-
          The date when the item was deleted
          example: 2023-08-10 15:48:25
        type: string
      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:
@@ -643,23 +698,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:
@@ -989,6 +1027,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance:
@@ -1110,6 +1152,10 @@
        $ref: '#/definitions/model.Client'
      client_id:
        type: integer
      collection_projections:
        items:
          $ref: '#/definitions/model.CollectionProjection'
        type: array
      competitors:
        type: string
      contact:
@@ -1310,6 +1356,9 @@
    type: object
  model.SalesRefund:
    properties:
      amountTotal:
        description: 价税合计
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
@@ -1319,10 +1368,16 @@
        $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:
@@ -1578,8 +1633,6 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      customerServiceSheet:
        $ref: '#/definitions/model.CustomerServiceSheet'
      file:
        type: string
      id:
@@ -1604,10 +1657,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:
@@ -1643,11 +1696,6 @@
      contactId:
        description: 联系人id
        type: integer
      contract:
        $ref: '#/definitions/model.Contract'
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -1663,11 +1711,6 @@
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      orderManage:
        $ref: '#/definitions/model.OrderManage'
      priorityLevel:
        $ref: '#/definitions/model.PriorityLevel'
      priorityLevelId:
@@ -1691,6 +1734,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: 服务人员
@@ -1986,6 +2039,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:
@@ -2295,6 +2360,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -2746,7 +2815,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -2773,9 +2842,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -2784,9 +2850,6 @@
        type: integer
      faultTypeId:
        description: 故障类别id
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -2806,12 +2869,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
@@ -2824,9 +2896,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -3218,14 +3287,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:
@@ -3251,25 +3324,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:
@@ -3303,6 +3385,8 @@
    properties:
      keyword:
        type: string
      keywordType:
        $ref: '#/definitions/constvar.SalesRefundKeywordType'
      page:
        description: 页码
        type: integer
@@ -3363,6 +3447,9 @@
      pageSize:
        description: 每页大小
        type: integer
      serviceOrderId:
        description: 服务回访单id
        type: integer
    type: object
  request.GetServiceOrderList:
    properties:
@@ -3378,6 +3465,10 @@
        type: integer
      queryClass:
        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
      salesDetailsId:
        type: integer
      serviceContractId:
        type: integer
    type: object
  request.GetSubOrderList:
    properties:
@@ -3437,6 +3528,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:
@@ -3816,6 +3917,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:
@@ -4262,6 +4374,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -4901,7 +5017,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -4928,9 +5044,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -4941,9 +5054,6 @@
        description: 故障类别id
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -4963,12 +5073,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
@@ -4981,9 +5100,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -6459,6 +6575,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:
@@ -9551,6 +9744,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: