merge

zhangqian

2023-08-14 2def11ba83760b5be1361f10c3756cc0e9cfd165

 docs/docs.go

@@ -9992,18 +9992,36 @@
                "BankAccountQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.CollectionStatus": {
        "constvar.CollectionSourceType": {
            "type": "integer",
            "enum": [
                1,
                2
            ],
            "x-enum-comments": {
                "CollectionSourceTypeSaleDetails": "销售明细",
                "CollectionSourceTypeServiceContract": "服务合同"
            },
            "x-enum-varnames": [
                "CollectionSourceTypeSaleDetails",
                "CollectionSourceTypeServiceContract"
            ]
        },
        "constvar.CollectionStatus": {
            "type": "integer",
            "enum": [
                1,
                2,
                3
            ],
            "x-enum-comments": {
                "CollectionStatusCollected": "已收款",
                "CollectionStatusSubCollected": "部分收款",
                "CollectionStatusUnCollected": "待收款"
            },
            "x-enum-varnames": [
                "CollectionStatusUnCollected",
                "CollectionStatusSubCollected",
                "CollectionStatusCollected"
            ]
        },
@@ -10144,6 +10162,35 @@
                "ReceiptQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.ReceiptSourceType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4,
                5
            ],
            "x-enum-varnames": [
                "ReceiptSourceTypeSalesDetails",
                "ReceiptSourceTypeServiceContract",
                "ReceiptSourceTypeInvoice",
                "ReceiptSourceTypeCollectionPlan",
                "ReceiptSourceTypeChuKuDan"
            ]
        },
        "constvar.RefundSourceType": {
            "type": "integer",
            "enum": [
                1
            ],
            "x-enum-comments": {
                "RefundSourceTypeSalesReturn": "销售退货"
            },
            "x-enum-varnames": [
                "RefundSourceTypeSalesReturn"
            ]
        },
        "constvar.SalesDetailsKeywordType": {
            "type": "string",
            "enum": [
@@ -10159,6 +10206,43 @@
                "SalesDetailsKeywordTypeSignTime",
                "SalesDetailsKeywordTypePrincipal",
                "SalesDetailsKeywordTypeProductName"
            ]
        },
        "constvar.SalesRefundKeywordType": {
            "type": "string",
            "enum": [
                "销售退货单编号",
                "客户名称",
                "退款日期",
                "账户",
                "是否开票",
                "付款方式",
                "销售负责人",
                "修改时间",
                "价税合计"
            ],
            "x-enum-varnames": [
                "SalesRefundKeywordRefundNumber",
                "SalesRefundKeywordClientName",
                "SalesRefundKeywordRefundDate",
                "SalesRefundKeywordAccount",
                "SalesRefundKeywordIsInvoice",
                "SalesRefundKeywordPaymentType",
                "SalesRefundKeywordPrincipal",
                "SalesRefundKeywordUpdateAt",
                "SalesRefundKeywordPriceTotal"
            ]
        },
        "constvar.SalesReturnSourceType": {
            "type": "integer",
            "enum": [
                1
            ],
            "x-enum-comments": {
                "SalesReturnSourceTypeSaleDetails": "销售明细"
            },
            "x-enum-varnames": [
                "SalesReturnSourceTypeSaleDetails"
            ]
        },
        "constvar.SalesStatus": {
@@ -10865,32 +10949,6 @@
                }
            }
        },
        "model.CustomerServiceSheet": {
            "type": "object",
            "properties": {
                "handleStatus": {
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "memberId": {
                    "type": "integer"
                },
                "number": {
                    "type": "string"
                },
                "priority": {
                    "type": "integer"
                },
                "serviceFollowupId": {
                    "type": "integer"
                },
                "serviceMode": {
                    "type": "integer"
                }
            }
        },
        "model.Department": {
            "type": "object",
            "properties": {
@@ -11424,6 +11482,13 @@
        "model.Receipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -11443,9 +11508,20 @@
                    "description": "币种",
                    "type": "string"
                },
                "paymentType": {
                    "$ref": "#/definitions/model.PaymentType"
                },
                "paymentTypeId": {
                    "description": "收款方式ID",
                    "type": "integer"
                },
                "principal": {
                    "description": "负责人id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "principalId": {
                    "description": "负责人id",
@@ -11465,7 +11541,11 @@
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -11694,6 +11774,9 @@
        "model.SalesDetails": {
            "type": "object",
            "properties": {
                "Member": {
                    "$ref": "#/definitions/model.User"
                },
                "address": {
                    "type": "string"
                },
@@ -11712,6 +11795,10 @@
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "价税合计",
                    "type": "number"
                },
                "amountUnInvoiced": {
                    "description": "未开票金额",
                    "type": "number"
@@ -11723,6 +11810,15 @@
                    "type": "integer"
                },
                "conditions": {
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorId": {
                    "type": "integer"
                },
                "creatorName": {
                    "type": "string"
                },
                "deliveryDate": {
@@ -11849,11 +11945,28 @@
        "model.SalesRefund": {
            "type": "object",
            "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"
@@ -11861,11 +11974,21 @@
                "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": {
                    "type": "array",
@@ -11879,16 +12002,45 @@
                "refundDate": {
                    "type": "string"
                },
                "refundMethod": {
                    "type": "string"
                "sourceId": {
                    "description": "源单id",
                    "type": "integer"
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.RefundSourceType"
                        }
                    ]
                }
            }
        },
        "model.SalesReturn": {
            "type": "object",
            "properties": {
                "Member": {
                    "$ref": "#/definitions/model.User"
                },
                "SalesReturnStatus": {
                    "description": "退货状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.SalesReturnStatus"
                        }
                    ]
                },
                "client": {
                    "$ref": "#/definitions/model.Client"
                },
                "clientId": {
                    "type": "integer"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorName": {
                    "type": "string"
                },
                "id": {
                    "type": "integer"
@@ -11900,22 +12052,38 @@
                    "type": "string"
                },
                "products": {
                    "description": "退货产品",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "reason": {
                    "description": "退货原因",
                    "type": "string"
                },
                "repository": {
                    "type": "string"
                },
                "returnDate": {
                    "description": "退货日期",
                    "type": "string"
                },
                "salesReturnStatus": {
                "salesReturnStatusId": {
                    "description": "退货状态id",
                    "type": "integer"
                },
                "sourceId": {
                    "description": "源单id",
                    "type": "integer"
                },
                "sourceType": {
                    "description": "源单类型（1销售明细）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
                        }
                    ]
                }
            }
        },
@@ -11959,6 +12127,18 @@
                    "description": "金额",
                    "type": "number"
                },
                "amountReceivable": {
                    "description": "应收金额",
                    "type": "number"
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "总额",
                    "type": "number"
                },
                "collectionDate": {
                    "description": "计划收款日期",
                    "type": "string"
@@ -11996,10 +12176,14 @@
                },
                "sourceType": {
                    "description": "源单类型（1销售明细2服务合同3销售发票）",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.CollectionSourceType"
                        }
                    ]
                },
                "status": {
                    "description": "状态（1未收2已收）",
                    "description": "状态（1未收2部分已收3已收）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.CollectionStatus"
@@ -12028,6 +12212,10 @@
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "价税合计",
                    "type": "number"
                },
                "amountUnInvoiced": {
@@ -12174,9 +12362,6 @@
                "contactId": {
                    "type": "integer"
                },
                "customerServiceSheet": {
                    "$ref": "#/definitions/model.CustomerServiceSheet"
                },
                "file": {
                    "type": "string"
                },
@@ -12286,9 +12471,6 @@
                },
                "id": {
                    "type": "integer"
                },
                "orderManage": {
                    "$ref": "#/definitions/model.OrderManage"
                },
                "priorityLevel": {
                    "$ref": "#/definitions/model.PriorityLevel"
@@ -13281,6 +13463,13 @@
        "request.AddReceipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -13300,9 +13489,20 @@
                    "description": "币种",
                    "type": "string"
                },
                "paymentType": {
                    "$ref": "#/definitions/model.PaymentType"
                },
                "paymentTypeId": {
                    "description": "收款方式ID",
                    "type": "integer"
                },
                "principal": {
                    "description": "负责人id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "principalId": {
                    "description": "负责人id",
@@ -13322,7 +13522,11 @@
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -13907,7 +14111,7 @@
                "satisfaction": {
                    "type": "integer"
                },
                "serviceId": {
                "serviceOrderId": {
                    "type": "integer"
                },
                "solveRate": {
@@ -13945,10 +14149,6 @@
                    "description": "联系人id",
                    "type": "integer"
                },
                "contractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "expectTime": {
                    "description": "希望处理时间",
                    "type": "string"
@@ -13959,10 +14159,6 @@
                },
                "faultTypeId": {
                    "description": "故障类别id",
                    "type": "integer"
                },
                "orderId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "priorityLevelId": {
@@ -13987,6 +14183,14 @@
                },
                "saleChanceId": {
                    "description": "销售机会id",
                    "type": "integer"
                },
                "salesDetailsId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "serviceContractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "serviceManId": {
@@ -14703,6 +14907,9 @@
                "keyword": {
                    "type": "string"
                },
                "keywordType": {
                    "$ref": "#/definitions/constvar.SalesRefundKeywordType"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -15052,7 +15259,8 @@
        "request.SalesRefund": {
            "type": "object",
            "properties": {
                "accountId": {
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
                },
                "clientId": {
@@ -15067,6 +15275,10 @@
                "number": {
                    "type": "string"
                },
                "paymentTypeId": {
                    "description": "收款方式ID",
                    "type": "integer"
                },
                "products": {
                    "type": "array",
                    "items": {
@@ -15079,8 +15291,17 @@
                "refundDate": {
                    "type": "string"
                },
                "refundMethod": {
                    "type": "string"
                "sourceId": {
                    "description": "源单id",
                    "type": "integer"
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.RefundSourceType"
                        }
                    ]
                }
            }
        },
@@ -15097,22 +15318,38 @@
                    "type": "string"
                },
                "products": {
                    "description": "退货产品",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "reason": {
                    "description": "退货原因",
                    "type": "string"
                },
                "repository": {
                    "type": "string"
                },
                "returnDate": {
                    "description": "退货日期",
                    "type": "string"
                },
                "status": {
                "salesReturnStatusId": {
                    "description": "退货状态id",
                    "type": "integer"
                },
                "sourceId": {
                    "description": "源单id",
                    "type": "integer"
                },
                "sourceType": {
                    "description": "源单类型（1销售明细）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
                        }
                    ]
                }
            }
        },
@@ -16188,6 +16425,13 @@
        "request.UpdateReceipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -16207,9 +16451,20 @@
                    "description": "币种",
                    "type": "string"
                },
                "paymentType": {
                    "$ref": "#/definitions/model.PaymentType"
                },
                "paymentTypeId": {
                    "description": "收款方式ID",
                    "type": "integer"
                },
                "principal": {
                    "description": "负责人id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "principalId": {
                    "description": "负责人id",
@@ -16229,7 +16484,11 @@
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -16744,6 +17003,18 @@
                    "description": "金额",
                    "type": "number"
                },
                "amountReceivable": {
                    "description": "应收金额",
                    "type": "number"
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "总额",
                    "type": "number"
                },
                "collectionDate": {
                    "description": "计划收款日期",
                    "type": "string"
@@ -16781,10 +17052,14 @@
                },
                "sourceType": {
                    "description": "源单类型（1销售明细2服务合同3销售发票）",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.CollectionSourceType"
                        }
                    ]
                },
                "status": {
                    "description": "状态（1未收2已收）",
                    "description": "状态（1未收2部分已收3已收）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.CollectionStatus"
@@ -17060,7 +17335,7 @@
                "satisfaction": {
                    "type": "integer"
                },
                "serviceId": {
                "serviceOrderId": {
                    "type": "integer"
                },
                "solveRate": {
@@ -17098,10 +17373,6 @@
                    "description": "联系人id",
                    "type": "integer"
                },
                "contractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "expectTime": {
                    "description": "希望处理时间",
                    "type": "string"
@@ -17115,10 +17386,6 @@
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "orderId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "priorityLevelId": {
@@ -17145,6 +17412,14 @@
                    "description": "销售机会id",
                    "type": "integer"
                },
                "salesDetailsId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "serviceContractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "serviceManId": {
                    "description": "服务人员",
                    "type": "integer"