Merge branch 'hotfix'

zhangqian

2023-08-25 b0c07ddee23e2d54d03636f08af19f0934857cf4

 docs/docs.go

@@ -1586,7 +1586,7 @@
                }
            }
        },
        "/api/contract/delete/{id}": {
        "/api/contract/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -1597,11 +1597,13 @@
                "summary": "删除合同",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteContract"
                        }
                    }
                ],
                "responses": {
@@ -4008,7 +4010,7 @@
                }
            }
        },
        "/api/masterOrder/delete/{id}": {
        "/api/masterOrder/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -4019,11 +4021,13 @@
                "summary": "删除主订单",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteMasterOrder"
                        }
                    }
                ],
                "responses": {
@@ -5226,7 +5230,7 @@
                }
            }
        },
        "/api/quotation/delete/{id}": {
        "/api/quotation/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -5237,11 +5241,13 @@
                "summary": "删除报价单",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteQuotation"
                        }
                    }
                ],
                "responses": {
@@ -6379,7 +6385,7 @@
                }
            }
        },
        "/api/saleChance/delete/{id}": {
        "/api/saleChance/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -6390,11 +6396,13 @@
                "summary": "删除销售机会",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteSaleChance"
                        }
                    }
                ],
                "responses": {
@@ -6771,7 +6779,19 @@
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                            "allOf": [
                                {
                                    "$ref": "#/definitions/contextx.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/request.AddSalesDetails"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
@@ -8014,9 +8034,9 @@
                    "application/json"
                ],
                "tags": [
                    "ServiceContractStatus"
                    "合同状态"
                ],
                "summary": "添加服务合同状态",
                "summary": "添加合同状态",
                "parameters": [
                    {
                        "description": "查询参数",
@@ -8044,9 +8064,9 @@
                    "application/json"
                ],
                "tags": [
                    "ServiceContractStatus"
                    "合同状态"
                ],
                "summary": "删除服务合同状态",
                "summary": "删除合同状态",
                "parameters": [
                    {
                        "type": "integer",
@@ -8072,22 +8092,66 @@
                    "application/json"
                ],
                "tags": [
                    "ServiceContractStatus"
                    "合同状态"
                ],
                "summary": "获取服务合同状态列表",
                "summary": "获取合同状态列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceContractStatusKeywordCustomerName"
                        ],
                        "name": "keywordType",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceContractStatusQueryClassExpireLessThen60Days"
                        ],
                        "name": "queryClass",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/contextx.Response"
                                    "$ref": "#/definitions/response.ListResponse"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.ServiceContractStatusResponse"
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/model.ServiceContractStatus"
                                            }
                                        }
                                    }
                                }
@@ -8103,9 +8167,9 @@
                    "application/json"
                ],
                "tags": [
                    "ServiceContractStatus"
                    "合同状态"
                ],
                "summary": "更新服务合同状态",
                "summary": "更新合同状态",
                "parameters": [
                    {
                        "description": "查询参数",
@@ -8113,7 +8177,7 @@
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.UpdateServiceContractStatuss"
                            "$ref": "#/definitions/request.UpdateServiceContractStatus"
                        }
                    }
                ],
@@ -9336,7 +9400,7 @@
                }
            }
        },
        "/api/subOrder/delete/{id}": {
        "/api/subOrder/delete": {
            "delete": {
                "produces": [
                    "application/json"
@@ -9347,11 +9411,13 @@
                "summary": "删除子订单",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteSubOrder"
                        }
                    }
                ],
                "responses": {
@@ -10515,6 +10581,24 @@
                "ServiceContractQueryClassExpiredBefore60Day"
            ]
        },
        "constvar.ServiceContractStatusKeywordType": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceContractStatusKeywordCustomerName"
            ]
        },
        "constvar.ServiceContractStatusQueryClass": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceContractStatusQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.ServiceFeeKeywordType": {
            "type": "string",
            "enum": [
@@ -10741,6 +10825,10 @@
        "model.Client": {
            "type": "object",
            "properties": {
                "_": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "business_scope": {
                    "type": "string"
                },
@@ -10786,6 +10874,13 @@
                "country_id": {
                    "type": "integer"
                },
                "created_at": {
                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "creator_id": {
                    "type": "integer"
                },
                "detail_address": {
                    "type": "string"
                },
@@ -10808,6 +10903,7 @@
                    }
                },
                "id": {
                    "description": "The ID of the item\nexample: 1",
                    "type": "integer"
                },
                "industry": {
@@ -10863,6 +10959,10 @@
                },
                "service_member_id": {
                    "type": "integer"
                },
                "updated_at": {
                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                }
            }
        },
@@ -11141,6 +11241,9 @@
                "quotationId": {
                    "type": "integer"
                },
                "serviceContractStatus": {
                    "$ref": "#/definitions/model.ServiceContractStatus"
                },
                "statusId": {
                    "type": "integer"
                },
@@ -11264,6 +11367,9 @@
                },
                "contact_id": {
                    "type": "integer"
                },
                "contact_information": {
                    "$ref": "#/definitions/model.ContactInformation"
                },
                "contact_information_id": {
                    "type": "integer"
@@ -11751,6 +11857,14 @@
                    "description": "账户id",
                    "type": "integer"
                },
                "client": {
                    "description": "客户id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.Client"
                        }
                    ]
                },
                "clientId": {
                    "description": "客户id",
                    "type": "integer"
@@ -12139,6 +12253,9 @@
                "signTime": {
                    "type": "string"
                },
                "updateTime": {
                    "type": "string"
                },
                "wechatOrderStatus": {
                    "$ref": "#/definitions/model.WechatOrderStatus"
                },
@@ -12292,6 +12409,9 @@
                            "$ref": "#/definitions/constvar.RefundSourceType"
                        }
                    ]
                },
                "updateTime": {
                    "type": "string"
                }
            }
        },
@@ -12371,6 +12491,9 @@
                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
                        }
                    ]
                },
                "updateTime": {
                    "type": "string"
                }
            }
        },
@@ -12521,6 +12644,12 @@
                "contactId": {
                    "type": "integer"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorName": {
                    "type": "string"
                },
                "endTime": {
                    "type": "string"
                },
@@ -12582,6 +12711,9 @@
                    "type": "string"
                },
                "terms": {
                    "type": "string"
                },
                "updateTime": {
                    "type": "string"
                }
            }
@@ -12652,6 +12784,12 @@
                "contactId": {
                    "type": "integer"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorName": {
                    "type": "string"
                },
                "file": {
                    "type": "string"
                },
@@ -12705,6 +12843,9 @@
                },
                "timelyRateId": {
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
                }
            }
        },
@@ -12740,6 +12881,12 @@
                "contactId": {
                    "description": "联系人id",
                    "type": "integer"
                },
                "createTime": {
                    "type": "string"
                },
                "creatorName": {
                    "type": "string"
                },
                "expectTime": {
                    "description": "希望处理时间",
@@ -12810,6 +12957,14 @@
                    "description": "服务合同id",
                    "type": "integer"
                },
                "serviceMan": {
                    "description": "服务人员",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "serviceManId": {
                    "description": "服务人员",
                    "type": "integer"
@@ -12853,6 +13008,9 @@
                "timeSpentId": {
                    "description": "花费时间",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
                }
            }
        },
@@ -13775,6 +13933,14 @@
                    "description": "账户id",
                    "type": "integer"
                },
                "client": {
                    "description": "客户id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.Client"
                        }
                    ]
                },
                "clientId": {
                    "description": "客户id",
                    "type": "integer"
@@ -14231,6 +14397,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },
@@ -14253,10 +14425,10 @@
        },
        "request.AddServiceContractStatus": {
            "type": "object",
            "required": [
                "name"
            ],
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
@@ -14861,6 +15033,17 @@
                }
            }
        },
        "request.DeleteContract": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteCountry": {
            "type": "object",
            "properties": {
@@ -14881,7 +15064,40 @@
                }
            }
        },
        "request.DeleteMasterOrder": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteOrderManage": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteQuotation": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteSaleChance": {
            "type": "object",
            "properties": {
                "ids": {
@@ -14915,6 +15131,17 @@
            }
        },
        "request.DeleteServiceFollowup": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteSubOrder": {
            "type": "object",
            "properties": {
                "ids": {
@@ -15020,7 +15247,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\",\"representative\": \"法定代表人\", \"registration_time\": \"注册时间\", \"business_scope\": \"经营范围\", \"remark\": \"备注\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -15038,7 +15265,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\", \"is_first\": \"是否是首要联系人\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\", \"is_first\": \"是否是首要联系人\", \"client_id\": \"clientId 用于返回首要联系人\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -16773,6 +17000,14 @@
                    "description": "账户id",
                    "type": "integer"
                },
                "client": {
                    "description": "客户id",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.Client"
                        }
                    ]
                },
                "clientId": {
                    "description": "客户id",
                    "type": "integer"
@@ -17451,6 +17686,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },
@@ -17473,30 +17714,12 @@
        },
        "request.UpdateServiceContractStatus": {
            "type": "object",
            "required": [
                "id",
                "name"
            ],
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
        "request.UpdateServiceContractStatuss": {
            "type": "object",
            "required": [
                "service_contract_status"
            ],
            "properties": {
                "service_contract_status": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.UpdateServiceContractStatus"
                    }
                }
            }
        },
@@ -18788,17 +19011,6 @@
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Satisfaction"
                    }
                }
            }
        },
        "response.ServiceContractStatusResponse": {
            "type": "object",
            "properties": {
                "list": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.ServiceContractStatus"
                    }
                }
            }