fix
wangpengfei
2023-08-14 18f5a87f2b647a27417aaffd62f48ff38be1d0d8
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": {
@@ -10625,16 +10709,16 @@
        "model.CollectionProjection": {
            "type": "object",
            "properties": {
                "_": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "created_at": {
                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "creator": {
                    "type": "integer"
                },
                "deleted_at": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "estimated_collection_amount": {
                    "type": "number"
@@ -10800,13 +10884,22 @@
        "model.Contract": {
            "type": "object",
            "properties": {
                "_": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "clientId": {
                    "type": "integer"
                },
                "created_at": {
                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "file": {
                    "type": "string"
                },
                "id": {
                    "description": "The ID of the item\nexample: 1",
                    "type": "integer"
                },
                "memberId": {
@@ -10823,6 +10916,10 @@
                },
                "statusId": {
                    "type": "integer"
                },
                "updated_at": {
                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                }
            }
        },
@@ -11398,6 +11495,13 @@
        "model.Receipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -11417,9 +11521,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",
@@ -11439,7 +11554,11 @@
                },
                "sourceType": {
                    "description": "来源类型(1销售明细单2服务合同3销售发票4收款计划5出库单)",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -11668,6 +11787,9 @@
        "model.SalesDetails": {
            "type": "object",
            "properties": {
                "Member": {
                    "$ref": "#/definitions/model.User"
                },
                "address": {
                    "type": "string"
                },
@@ -11686,6 +11808,10 @@
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "价税合计",
                    "type": "number"
                },
                "amountUnInvoiced": {
                    "description": "未开票金额",
                    "type": "number"
@@ -11697,6 +11823,15 @@
                    "type": "integer"
                },
                "conditions": {
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorId": {
                    "type": "integer"
                },
                "creatorName": {
                    "type": "string"
                },
                "deliveryDate": {
@@ -11823,11 +11958,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"
@@ -11835,11 +11987,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",
@@ -11853,16 +12015,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"
@@ -11874,22 +12065,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"
                        }
                    ]
                }
            }
        },
@@ -11933,6 +12140,18 @@
                    "description": "金额",
                    "type": "number"
                },
                "amountReceivable": {
                    "description": "应收金额",
                    "type": "number"
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "总额",
                    "type": "number"
                },
                "collectionDate": {
                    "description": "计划收款日期",
                    "type": "string"
@@ -11970,10 +12189,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"
@@ -12002,6 +12225,10 @@
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "价税合计",
                    "type": "number"
                },
                "amountUnInvoiced": {
@@ -13249,6 +13476,13 @@
        "request.AddReceipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -13268,9 +13502,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",
@@ -13290,7 +13535,11 @@
                },
                "sourceType": {
                    "description": "来源类型(1销售明细单2服务合同3销售发票4收款计划5出库单)",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -14491,9 +14740,6 @@
        "request.GetContractList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -14501,6 +14747,11 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{} {\"member_name\": \"销售负责人\", \"number\": \"合同编号\", \"created_at\": \"创建时间\"}",
                    "type": "object",
                    "additionalProperties": true
                }
            }
        },
@@ -14547,9 +14798,6 @@
        "request.GetMasterOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -14557,6 +14805,11 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"销售总单号\", \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"start_time\": \"开始时间\", \"end_time\": \"结束时间\", \"money\": \"总金额\", \"member_name\": \"负责人\"}",
                    "type": "object",
                    "additionalProperties": true
                }
            }
        },
@@ -14604,7 +14857,7 @@
                    "type": "integer"
                },
                "searchMap": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -14670,6 +14923,9 @@
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "keywordType": {
                    "$ref": "#/definitions/constvar.SalesRefundKeywordType"
                },
                "page": {
                    "description": "页码",
@@ -14795,9 +15051,6 @@
        "request.GetSubOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -14805,6 +15058,11 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"销售子单号\", \"client_name\": \"客户名称\", \"master_order_number\": \"销售总单号\", \"member_name\": \"销售负责人\", \"master_order_id\": \"销售总单id\"}",
                    "type": "object",
                    "additionalProperties": true
                }
            }
        },
@@ -15020,7 +15278,8 @@
        "request.SalesRefund": {
            "type": "object",
            "properties": {
                "accountId": {
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
                },
                "clientId": {
@@ -15035,6 +15294,10 @@
                "number": {
                    "type": "string"
                },
                "paymentTypeId": {
                    "description": "收款方式ID",
                    "type": "integer"
                },
                "products": {
                    "type": "array",
                    "items": {
@@ -15047,8 +15310,17 @@
                "refundDate": {
                    "type": "string"
                },
                "refundMethod": {
                    "type": "string"
                "sourceId": {
                    "description": "源单id",
                    "type": "integer"
                },
                "sourceType": {
                    "description": "来源类型(1销售明细单2服务合同3销售发票4收款计划5出库单)",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.RefundSourceType"
                        }
                    ]
                }
            }
        },
@@ -15065,22 +15337,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"
                        }
                    ]
                }
            }
        },
@@ -16156,6 +16444,13 @@
        "request.UpdateReceipt": {
            "type": "object",
            "properties": {
                "amount": {
                    "description": "收款金额",
                    "type": "number"
                },
                "bankAccount": {
                    "$ref": "#/definitions/model.BankAccount"
                },
                "bankAccountId": {
                    "description": "账户id",
                    "type": "integer"
@@ -16175,9 +16470,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",
@@ -16197,7 +16503,11 @@
                },
                "sourceType": {
                    "description": "来源类型(1销售明细单2服务合同3销售发票4收款计划5出库单)",
                    "type": "integer"
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ReceiptSourceType"
                        }
                    ]
                }
            }
        },
@@ -16712,6 +17022,18 @@
                    "description": "金额",
                    "type": "number"
                },
                "amountReceivable": {
                    "description": "应收金额",
                    "type": "number"
                },
                "amountReceived": {
                    "description": "已收金额",
                    "type": "number"
                },
                "amountTotal": {
                    "description": "总额",
                    "type": "number"
                },
                "collectionDate": {
                    "description": "计划收款日期",
                    "type": "string"
@@ -16749,10 +17071,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"