Merge branch 'master' into fly

wangpengfei

2023-08-14 f84d9c46574a2cd663105859035bc17891270923

 docs/swagger.yaml

@@ -11,16 +11,30 @@
    type: string
    x-enum-varnames:
    - BankAccountQueryClassExpireLessThen60Days
  constvar.CollectionStatus:
  constvar.CollectionSourceType:
    enum:
    - 1
    - 2
    type: integer
    x-enum-comments:
      CollectionSourceTypeSaleDetails: 销售明细
      CollectionSourceTypeServiceContract: 服务合同
    x-enum-varnames:
    - CollectionSourceTypeSaleDetails
    - CollectionSourceTypeServiceContract
  constvar.CollectionStatus:
    enum:
    - 1
    - 2
    - 3
    type: integer
    x-enum-comments:
      CollectionStatusCollected: 已收款
      CollectionStatusSubCollected: 部分收款
      CollectionStatusUnCollected: 待收款
    x-enum-varnames:
    - CollectionStatusUnCollected
    - CollectionStatusSubCollected
    - CollectionStatusCollected
  constvar.CourierCompanyKeywordType:
    enum:
@@ -114,6 +128,28 @@
    type: string
    x-enum-varnames:
    - ReceiptQueryClassExpireLessThen60Days
  constvar.ReceiptSourceType:
    enum:
    - 1
    - 2
    - 3
    - 4
    - 5
    type: integer
    x-enum-varnames:
    - ReceiptSourceTypeSalesDetails
    - ReceiptSourceTypeServiceContract
    - ReceiptSourceTypeInvoice
    - ReceiptSourceTypeCollectionPlan
    - ReceiptSourceTypeChuKuDan
  constvar.RefundSourceType:
    enum:
    - 1
    type: integer
    x-enum-comments:
      RefundSourceTypeSalesReturn: 销售退货
    x-enum-varnames:
    - RefundSourceTypeSalesReturn
  constvar.SalesDetailsKeywordType:
    enum:
    - 客户名称
@@ -128,6 +164,36 @@
    - SalesDetailsKeywordTypeSignTime
    - SalesDetailsKeywordTypePrincipal
    - SalesDetailsKeywordTypeProductName
  constvar.SalesRefundKeywordType:
    enum:
    - 销售退货单编号
    - 客户名称
    - 退款日期
    - 账户
    - 是否开票
    - 付款方式
    - 销售负责人
    - 修改时间
    - 价税合计
    type: string
    x-enum-varnames:
    - SalesRefundKeywordRefundNumber
    - SalesRefundKeywordClientName
    - SalesRefundKeywordRefundDate
    - SalesRefundKeywordAccount
    - SalesRefundKeywordIsInvoice
    - SalesRefundKeywordPaymentType
    - SalesRefundKeywordPrincipal
    - SalesRefundKeywordUpdateAt
    - SalesRefundKeywordPriceTotal
  constvar.SalesReturnSourceType:
    enum:
    - 1
    type: integer
    x-enum-comments:
      SalesReturnSourceTypeSaleDetails: 销售明细
    x-enum-varnames:
    - SalesReturnSourceTypeSaleDetails
  constvar.SalesStatus:
    enum:
    - 0
@@ -633,23 +699,6 @@
      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:
      id:
@@ -1000,6 +1049,11 @@
    type: object
  model.Receipt:
    properties:
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -1014,9 +1068,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
@@ -1030,8 +1090,9 @@
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.ReceiptSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
        type: integer
    type: object
  model.RefundMethod:
    properties:
@@ -1180,6 +1241,8 @@
    type: object
  model.SalesDetails:
    properties:
      Member:
        $ref: '#/definitions/model.User'
      address:
        type: string
      addressee:
@@ -1193,6 +1256,9 @@
      amountReceived:
        description: 已收金额
        type: number
      amountTotal:
        description: 价税合计
        type: number
      amountUnInvoiced:
        description: 未开票金额
        type: number
@@ -1201,6 +1267,12 @@
      clientId:
        type: integer
      conditions:
        type: string
      createTime:
        type: string
      creatorId:
        type: integer
      creatorName:
        type: string
      deliveryDate:
        type: string
@@ -1284,18 +1356,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'
@@ -1304,13 +1395,30 @@
        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:
      Member:
        $ref: '#/definitions/model.User'
      SalesReturnStatus:
        allOf:
        - $ref: '#/definitions/model.SalesReturnStatus'
        description: 退货状态
      client:
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      createTime:
        type: string
      creatorName:
        type: string
      id:
        type: integer
      memberId:
@@ -1318,17 +1426,28 @@
      number:
        type: string
      products:
        description: 退货产品
        items:
          $ref: '#/definitions/model.Product'
        type: array
      reason:
        description: 退货原因
        type: string
      repository:
        type: string
      returnDate:
        description: 退货日期
        type: string
      salesReturnStatus:
      salesReturnStatusId:
        description: 退货状态id
        type: integer
      sourceId:
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.SalesReturnSourceType'
        description: 源单类型（1销售明细）
    type: object
  model.SalesReturnStatus:
    properties:
@@ -1355,6 +1474,15 @@
    properties:
      amount:
        description: 金额
        type: number
      amountReceivable:
        description: 应收金额
        type: number
      amountReceived:
        description: 已收金额
        type: number
      amountTotal:
        description: 总额
        type: number
      collectionDate:
        description: 计划收款日期
@@ -1383,12 +1511,13 @@
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.CollectionSourceType'
        description: 源单类型（1销售明细2服务合同3销售发票）
        type: integer
      status:
        allOf:
        - $ref: '#/definitions/constvar.CollectionStatus'
        description: 状态（1未收2已收）
        description: 状态（1未收2部分已收3已收）
      term:
        description: 期次
        type: integer
@@ -1405,6 +1534,9 @@
        type: number
      amountReceived:
        description: 已收金额
        type: number
      amountTotal:
        description: 价税合计
        type: number
      amountUnInvoiced:
        description: 未开票金额
@@ -1501,8 +1633,6 @@
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      customerServiceSheet:
        $ref: '#/definitions/model.CustomerServiceSheet'
      file:
        type: string
      id:
@@ -1527,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:
@@ -1566,11 +1696,6 @@
      contactId:
        description: 联系人id
        type: integer
      contract:
        $ref: '#/definitions/model.Contract'
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -1586,11 +1711,6 @@
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      orderManage:
        $ref: '#/definitions/model.OrderManage'
      priorityLevel:
        $ref: '#/definitions/model.PriorityLevel'
      priorityLevelId:
@@ -1614,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: 服务人员
@@ -2250,6 +2380,11 @@
    type: object
  request.AddReceipt:
    properties:
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -2264,9 +2399,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
@@ -2280,8 +2421,9 @@
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.ReceiptSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
        type: integer
    type: object
  request.AddRefundMethod:
    properties:
@@ -2673,7 +2815,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -2700,9 +2842,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -2711,9 +2850,6 @@
        type: integer
      faultTypeId:
        description: 故障类别id
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -2732,6 +2868,12 @@
        type: string
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetailsId:
        description: 销售订单id
        type: integer
      serviceContractId:
        description: 合同id
        type: integer
      serviceManId:
        description: 服务人员
@@ -3243,6 +3385,8 @@
    properties:
      keyword:
        type: string
      keywordType:
        $ref: '#/definitions/constvar.SalesRefundKeywordType'
      page:
        description: 页码
        type: integer
@@ -3303,6 +3447,9 @@
      pageSize:
        description: 每页大小
        type: integer
      serviceOrderId:
        description: 服务回访单id
        type: integer
    type: object
  request.GetServiceOrderList:
    properties:
@@ -3318,6 +3465,10 @@
        type: integer
      queryClass:
        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
      salesDetailsId:
        type: integer
      serviceContractId:
        type: integer
    type: object
  request.GetSubOrderList:
    properties:
@@ -3471,7 +3622,8 @@
    type: object
  request.SalesRefund:
    properties:
      accountId:
      bankAccountId:
        description: 账户id
        type: integer
      clientId:
        type: integer
@@ -3481,6 +3633,9 @@
        type: integer
      number:
        type: string
      paymentTypeId:
        description: 收款方式ID
        type: integer
      products:
        items:
          $ref: '#/definitions/model.Product'
@@ -3489,8 +3644,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:
@@ -3501,17 +3661,28 @@
      number:
        type: string
      products:
        description: 退货产品
        items:
          $ref: '#/definitions/model.Product'
        type: array
      reason:
        description: 退货原因
        type: string
      repository:
        type: string
      returnDate:
        description: 退货日期
        type: string
      status:
      salesReturnStatusId:
        description: 退货状态id
        type: integer
      sourceId:
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.SalesReturnSourceType'
        description: 源单类型（1销售明细）
    type: object
  request.SetAuthorityMenu:
    properties:
@@ -4235,6 +4406,11 @@
    type: object
  request.UpdateReceipt:
    properties:
      amount:
        description: 收款金额
        type: number
      bankAccount:
        $ref: '#/definitions/model.BankAccount'
      bankAccountId:
        description: 账户id
        type: integer
@@ -4249,9 +4425,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
@@ -4265,8 +4447,9 @@
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.ReceiptSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
        type: integer
    type: object
  request.UpdateRefundMethod:
    properties:
@@ -4607,6 +4790,15 @@
      amount:
        description: 金额
        type: number
      amountReceivable:
        description: 应收金额
        type: number
      amountReceived:
        description: 已收金额
        type: number
      amountTotal:
        description: 总额
        type: number
      collectionDate:
        description: 计划收款日期
        type: string
@@ -4634,12 +4826,13 @@
        description: 源单id
        type: integer
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.CollectionSourceType'
        description: 源单类型（1销售明细2服务合同3销售发票）
        type: integer
      status:
        allOf:
        - $ref: '#/definitions/constvar.CollectionStatus'
        description: 状态（1未收2已收）
        description: 状态（1未收2部分已收3已收）
      term:
        description: 期次
        type: integer
@@ -4824,7 +5017,7 @@
        type: string
      satisfaction:
        type: integer
      serviceId:
      serviceOrderId:
        type: integer
      solveRate:
        type: integer
@@ -4851,9 +5044,6 @@
      contactId:
        description: 联系人id
        type: integer
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -4864,9 +5054,6 @@
        description: 故障类别id
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      priorityLevelId:
        description: 优先级别id
@@ -4886,6 +5073,12 @@
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetailsId:
        description: 销售订单id
        type: integer
      serviceContractId:
        description: 合同id
        type: integer
      serviceManId:
        description: 服务人员
        type: integer