From 6e87a1f6795af50133b10fa853fd6c2d14bb698c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 13 八月 2023 15:20:27 +0800
Subject: [PATCH] 完善退款单

---
 docs/docs.go | 1049 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 992 insertions(+), 57 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index fac055d..b96c515 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7620,7 +7620,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/request.DeleteserviceContract"
+                            "$ref": "#/definitions/request.DeleteServiceContract"
                         }
                     }
                 ],
@@ -7642,7 +7642,7 @@
                 "tags": [
                     "ServiceContract"
                 ],
-                "summary": "鐢熸垚璁″垝鍒楄〃",
+                "summary": "鏈嶅姟鍚堝悓鍒楄〃",
                 "parameters": [
                     {
                         "description": "鍙傛暟",
@@ -8267,7 +8267,7 @@
             }
         },
         "/api/serviceOrder/list": {
-            "get": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -8275,6 +8275,17 @@
                     "鏈嶅姟鍗曠鐞�"
                 ],
                 "summary": "鑾峰彇鏈嶅姟鍗曞垪琛�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetServiceOrderList"
+                        }
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -8317,6 +8328,169 @@
                         "required": true,
                         "schema": {
                             "$ref": "#/definitions/request.UpdateServiceOrder"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/serviceOrderStatus/add": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鏈嶅姟鍗曠姸鎬�"
+                ],
+                "summary": "娣诲姞鏈嶅姟鍗曠姸鎬�",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.AddServiceOrderStatus"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/serviceOrderStatus/delete/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鏈嶅姟鍗曠姸鎬�"
+                ],
+                "summary": "鍒犻櫎鏈嶅姟鍗曠姸鎬�",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/serviceOrderStatus/list": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鏈嶅姟鍗曠姸鎬�"
+                ],
+                "summary": "鑾峰彇鏈嶅姟鍗曠姸鎬佸垪琛�",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "name": "keyword",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            ""
+                        ],
+                        "type": "string",
+                        "x-enum-varnames": [
+                            "ServiceOrderStatusKeywordCustomerName"
+                        ],
+                        "name": "keywordType",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            ""
+                        ],
+                        "type": "string",
+                        "x-enum-varnames": [
+                            "ServiceOrderStatusQueryClassExpireLessThen60Days"
+                        ],
+                        "name": "queryClass",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.ListResponse"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/model.ServiceOrderStatus"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api/serviceOrderStatus/update": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鏈嶅姟鍗曠姸鎬�"
+                ],
+                "summary": "鏇存柊鏈嶅姟鍗曠姸鎬�",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.UpdateServiceOrderStatus"
                         }
                     }
                 ],
@@ -9483,6 +9657,169 @@
                     }
                 }
             }
+        },
+        "/api/wechatOrderStatus/add": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "寰俊璁㈠崟鐘舵��"
+                ],
+                "summary": "娣诲姞寰俊璁㈠崟鐘舵��",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.AddWechatOrderStatus"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/wechatOrderStatus/delete/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "寰俊璁㈠崟鐘舵��"
+                ],
+                "summary": "鍒犻櫎寰俊璁㈠崟鐘舵��",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/wechatOrderStatus/list": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "寰俊璁㈠崟鐘舵��"
+                ],
+                "summary": "鑾峰彇寰俊璁㈠崟鐘舵�佸垪琛�",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "name": "keyword",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            ""
+                        ],
+                        "type": "string",
+                        "x-enum-varnames": [
+                            "WechatOrderStatusKeywordCustomerName"
+                        ],
+                        "name": "keywordType",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            ""
+                        ],
+                        "type": "string",
+                        "x-enum-varnames": [
+                            "WechatOrderStatusQueryClassExpireLessThen60Days"
+                        ],
+                        "name": "queryClass",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.ListResponse"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/model.WechatOrderStatus"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api/wechatOrderStatus/update": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "寰俊璁㈠崟鐘舵��"
+                ],
+                "summary": "鏇存柊寰俊璁㈠崟鐘舵��",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.UpdateWechatOrderStatus"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -9504,18 +9841,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"
             ]
         },
@@ -9656,6 +10011,64 @@
                 "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": [
+                "瀹㈡埛鍚嶇О",
+                "璁㈠崟缂栧彿",
+                "绛剧害鏃ユ湡",
+                "閿�鍞礋璐d汉",
+                "浜у搧鍚嶇О"
+            ],
+            "x-enum-varnames": [
+                "SalesDetailsKeywordTypeCustomerName",
+                "SalesDetailsKeywordTypeOrderNumber",
+                "SalesDetailsKeywordTypeSignTime",
+                "SalesDetailsKeywordTypePrincipal",
+                "SalesDetailsKeywordTypeProductName"
+            ]
+        },
+        "constvar.SalesReturnSourceType": {
+            "type": "integer",
+            "enum": [
+                1
+            ],
+            "x-enum-comments": {
+                "SalesReturnSourceTypeSaleDetails": "閿�鍞槑缁�"
+            },
+            "x-enum-varnames": [
+                "SalesReturnSourceTypeSaleDetails"
+            ]
+        },
         "constvar.SalesStatus": {
             "type": "integer",
             "enum": [
@@ -9663,7 +10076,6 @@
                 1,
                 2,
                 3,
-                4,
                 -1
             ],
             "x-enum-comments": {
@@ -9671,13 +10083,11 @@
                 "SalesStatusIng": "杩涜涓�",
                 "SalesStatusLevelUptoClient": "鍗囩骇涓哄鎴�",
                 "SalesStatusLevelUptoClientAndSalesChance": "鍗囩骇涓哄鎴峰苟涓旀湁閿�鍞満浼�",
-                "SalesStatusNew": "鏂板缓",
-                "SalesStatusSuccess": "鎴愬姛"
+                "SalesStatusNew": "鏂板缓"
             },
             "x-enum-varnames": [
                 "SalesStatusNew",
                 "SalesStatusIng",
-                "SalesStatusSuccess",
                 "SalesStatusLevelUptoClient",
                 "SalesStatusLevelUptoClientAndSalesChance",
                 "SalesStatusFail"
@@ -9788,6 +10198,56 @@
                 "ServiceFollowupKeywordSatisfactionDegree"
             ]
         },
+        "constvar.ServiceOrderKeywordType": {
+            "type": "string",
+            "enum": [
+                "鏈嶅姟鍗曠紪鍙�",
+                "涓婚",
+                "瀹㈡埛鍚嶇О",
+                "瀹為檯澶勭悊鏃堕棿",
+                "鏈嶅姟浜哄憳",
+                "鏈嶅姟鏂瑰紡",
+                "浜у搧绫诲埆",
+                "鏁呴殰绫诲埆"
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderKeywordOrderNumber",
+                "ServiceOrderKeywordSubject",
+                "ServiceOrderKeywordClientName",
+                "ServiceOrderKeywordRealProcessTime",
+                "ServiceOrderKeywordServiceMan",
+                "ServiceOrderKeywordServiceType",
+                "ServiceOrderKeywordProductType",
+                "ServiceOrderKeywordFaultType"
+            ]
+        },
+        "constvar.ServiceOrderQueryClass": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderQueryClassExpireLessThen60Days"
+            ]
+        },
+        "constvar.ServiceOrderStatusKeywordType": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderStatusKeywordCustomerName"
+            ]
+        },
+        "constvar.ServiceOrderStatusQueryClass": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderStatusQueryClassExpireLessThen60Days"
+            ]
+        },
         "constvar.UserType": {
             "type": "integer",
             "enum": [
@@ -9804,6 +10264,24 @@
                 "UserTypeSuper",
                 "UserTypePrimary",
                 "UserTypeSub"
+            ]
+        },
+        "constvar.WechatOrderStatusKeywordType": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "WechatOrderStatusKeywordCustomerName"
+            ]
+        },
+        "constvar.WechatOrderStatusQueryClass": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "WechatOrderStatusQueryClassExpireLessThen60Days"
             ]
         },
         "contextx.Response": {
@@ -10370,6 +10848,9 @@
                 "id": {
                     "type": "integer"
                 },
+                "member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "member_id": {
                     "type": "integer"
                 },
@@ -10456,6 +10937,12 @@
                 "principalId": {
                     "description": "閿�鍞礋璐d汉id",
                     "type": "integer"
+                },
+                "products": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Product"
+                    }
                 },
                 "sourceId": {
                     "description": "婧愬崟id",
@@ -10706,7 +11193,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "type": "integer"
+                    "type": "number"
                 },
                 "desc": {
                     "type": "string"
@@ -10803,6 +11290,13 @@
         "model.Receipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -10822,9 +11316,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -10844,7 +11349,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -11067,11 +11576,34 @@
         "model.SalesDetails": {
             "type": "object",
             "properties": {
+                "Member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "address": {
                     "type": "string"
                 },
                 "addressee": {
                     "type": "string"
+                },
+                "amountInvoiced": {
+                    "description": "宸插紑绁ㄩ噾棰�",
+                    "type": "number"
+                },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountTotal": {
+                    "description": "浠风◣鍚堣",
+                    "type": "number"
+                },
+                "amountUnInvoiced": {
+                    "description": "鏈紑绁ㄩ噾棰�",
+                    "type": "number"
                 },
                 "client": {
                     "$ref": "#/definitions/model.Client"
@@ -11080,6 +11612,15 @@
                     "type": "integer"
                 },
                 "conditions": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorId": {
+                    "type": "integer"
+                },
+                "creatorName": {
                     "type": "string"
                 },
                 "deliveryDate": {
@@ -11115,6 +11656,9 @@
                 "remark": {
                     "type": "string"
                 },
+                "saleChance": {
+                    "$ref": "#/definitions/model.SaleChance"
+                },
                 "saleChanceId": {
                     "type": "integer"
                 },
@@ -11125,6 +11669,9 @@
                     "type": "string"
                 },
                 "wechatOrderStatus": {
+                    "$ref": "#/definitions/model.WechatOrderStatus"
+                },
+                "wechatOrderStatusId": {
                     "type": "integer"
                 }
             }
@@ -11200,8 +11747,15 @@
         "model.SalesRefund": {
             "type": "object",
             "properties": {
-                "accountId": {
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
+                "bankAccountId": {
+                    "description": "璐︽埛id",
                     "type": "integer"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
                 },
                 "clientId": {
                     "type": "integer"
@@ -11218,6 +11772,13 @@
                 "number": {
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
+                "paymentTypeId": {
+                    "description": "鏀舵鏂瑰紡ID",
+                    "type": "integer"
+                },
                 "products": {
                     "type": "array",
                     "items": {
@@ -11230,16 +11791,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"
@@ -11251,22 +11841,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": "閫�璐х姸鎬乮d",
                     "type": "integer"
+                },
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -11310,6 +11916,18 @@
                     "description": "閲戦",
                     "type": "number"
                 },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountTotal": {
+                    "description": "鎬婚",
+                    "type": "number"
+                },
                 "collectionDate": {
                     "description": "璁″垝鏀舵鏃ユ湡",
                     "type": "string"
@@ -11347,10 +11965,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"
@@ -11366,6 +11988,9 @@
         "model.ServiceContract": {
             "type": "object",
             "properties": {
+                "SaleChance": {
+                    "$ref": "#/definitions/model.SaleChance"
+                },
                 "amountInvoiced": {
                     "description": "宸插紑绁ㄩ噾棰�",
                     "type": "number"
@@ -11378,13 +12003,24 @@
                     "description": "宸叉敹閲戦",
                     "type": "number"
                 },
+                "amountTotal": {
+                    "description": "浠风◣鍚堣",
+                    "type": "number"
+                },
+                "amountUnInvoiced": {
+                    "description": "鏈紑绁ㄩ噾棰�",
+                    "type": "number"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
+                },
                 "clientId": {
                     "type": "integer"
                 },
-                "contactId": {
-                    "type": "integer"
+                "contact": {
+                    "$ref": "#/definitions/model.Contact"
                 },
-                "contractId": {
+                "contactId": {
                     "type": "integer"
                 },
                 "endTime": {
@@ -11405,6 +12041,9 @@
                         "$ref": "#/definitions/model.Product"
                     }
                 },
+                "quotation": {
+                    "$ref": "#/definitions/model.Quotation"
+                },
                 "quotationId": {
                     "type": "integer"
                 },
@@ -11414,8 +12053,20 @@
                 "saleChanceId": {
                     "type": "integer"
                 },
+                "salesDetails": {
+                    "$ref": "#/definitions/model.SalesDetails"
+                },
+                "salesDetailsId": {
+                    "type": "integer"
+                },
+                "serviceContractStatus": {
+                    "$ref": "#/definitions/model.ServiceContractStatus"
+                },
                 "serviceContractStatusId": {
                     "type": "integer"
+                },
+                "serviceContractType": {
+                    "$ref": "#/definitions/model.ServiceContractType"
                 },
                 "serviceContractTypeId": {
                     "type": "integer"
@@ -11485,8 +12136,17 @@
         "model.ServiceFollowup": {
             "type": "object",
             "properties": {
+                "Member": {
+                    "$ref": "#/definitions/model.User"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
+                },
                 "clientId": {
                     "type": "integer"
+                },
+                "contact": {
+                    "$ref": "#/definitions/model.Contact"
                 },
                 "contactId": {
                     "type": "integer"
@@ -11500,6 +12160,9 @@
                 "id": {
                     "type": "integer"
                 },
+                "isVisit": {
+                    "$ref": "#/definitions/model.IsVisit"
+                },
                 "isVisitId": {
                     "type": "integer"
                 },
@@ -11508,6 +12171,9 @@
                 },
                 "number": {
                     "type": "string"
+                },
+                "oldMember": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "oldMemberId": {
                     "type": "integer"
@@ -11518,6 +12184,9 @@
                 "remark": {
                     "type": "string"
                 },
+                "satisfaction": {
+                    "$ref": "#/definitions/model.Satisfaction"
+                },
                 "satisfactionId": {
                     "type": "integer"
                 },
@@ -11527,8 +12196,14 @@
                 "serviceOrder": {
                     "$ref": "#/definitions/model.ServiceOrder"
                 },
+                "solveRate": {
+                    "$ref": "#/definitions/model.SolveRate"
+                },
                 "solveRateId": {
                     "type": "integer"
+                },
+                "timelyRate": {
+                    "$ref": "#/definitions/model.TimelyRate"
                 },
                 "timelyRateId": {
                     "type": "integer"
@@ -11547,11 +12222,11 @@
                     "type": "string"
                 },
                 "carFare": {
-                    "description": "浜ら�氳垂",
+                    "description": "浜ら�氳垂                                                                 // 浜ら�氳垂",
                     "type": "number"
                 },
                 "chargeAmount": {
-                    "description": "鏀惰垂閲戦",
+                    "description": "鏀惰垂閲戦                                                       // 鏀惰垂閲戦",
                     "type": "number"
                 },
                 "client": {
@@ -11644,6 +12319,13 @@
                     "description": "鏈嶅姟鍗曠紪鍙�",
                     "type": "string"
                 },
+                "serviceOrderStatus": {
+                    "$ref": "#/definitions/model.ServiceOrderStatus"
+                },
+                "serviceOrderStatusId": {
+                    "description": "澶勭悊鐘舵��",
+                    "type": "integer"
+                },
                 "serviceType": {
                     "$ref": "#/definitions/model.ServiceType"
                 },
@@ -11662,10 +12344,6 @@
                     "description": "鍐呴儴澶囨敞",
                     "type": "string"
                 },
-                "status": {
-                    "description": "澶勭悊鐘舵��",
-                    "type": "integer"
-                },
                 "subject": {
                     "description": "涓婚",
                     "type": "string"
@@ -11676,6 +12354,17 @@
                 "timeSpentId": {
                     "description": "鑺辫垂鏃堕棿",
                     "type": "integer"
+                }
+            }
+        },
+        "model.ServiceOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
                 }
             }
         },
@@ -11822,6 +12511,17 @@
                     "type": "string"
                 },
                 "uuid": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.WechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
                     "type": "string"
                 }
             }
@@ -12297,6 +12997,13 @@
                     "description": "閿�鍞礋璐d汉id",
                     "type": "integer"
                 },
+                "products": {
+                    "description": "鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Product"
+                    }
+                },
                 "sourceId": {
                     "description": "婧愬崟id",
                     "type": "integer"
@@ -12525,6 +13232,13 @@
         "request.AddReceipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -12544,9 +13258,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -12566,7 +13291,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -12763,8 +13492,59 @@
         "request.AddSalesDetails": {
             "type": "object",
             "properties": {
-                "salesDetails": {
-                    "$ref": "#/definitions/request.SalesDetails"
+                "address": {
+                    "type": "string"
+                },
+                "addressee": {
+                    "type": "string"
+                },
+                "clientId": {
+                    "type": "integer"
+                },
+                "conditions": {
+                    "type": "string"
+                },
+                "deliveryDate": {
+                    "type": "string"
+                },
+                "logisticCompany": {
+                    "type": "string"
+                },
+                "logisticCost": {
+                    "type": "number"
+                },
+                "logisticNumber": {
+                    "type": "string"
+                },
+                "memberId": {
+                    "type": "integer"
+                },
+                "number": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "products": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Product"
+                    }
+                },
+                "remark": {
+                    "type": "string"
+                },
+                "saleChanceId": {
+                    "type": "integer"
+                },
+                "saleType": {
+                    "type": "integer"
+                },
+                "signTime": {
+                    "type": "string"
+                },
+                "wechatOrderStatusId": {
+                    "type": "integer"
                 }
             }
         },
@@ -12882,14 +13662,14 @@
         },
         "request.AddServiceContract": {
             "type": "object",
+            "required": [
+                "memberId"
+            ],
             "properties": {
                 "clientId": {
                     "type": "integer"
                 },
                 "contactId": {
-                    "type": "integer"
-                },
-                "contractId": {
                     "type": "integer"
                 },
                 "endTime": {
@@ -12914,6 +13694,9 @@
                     "type": "string"
                 },
                 "saleChanceId": {
+                    "type": "integer"
+                },
+                "salesDetailsId": {
                     "type": "integer"
                 },
                 "serviceTimes": {
@@ -13217,6 +14000,17 @@
                 }
             }
         },
+        "request.AddServiceOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "request.AddServiceType": {
             "type": "object",
             "properties": {
@@ -13330,6 +14124,17 @@
                 },
                 "vettingType": {
                     "type": "integer"
+                }
+            }
+        },
+        "request.AddWechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
                 }
             }
         },
@@ -13536,6 +14341,17 @@
                 }
             }
         },
+        "request.DeleteServiceContract": {
+            "type": "object",
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "request.DeleteServiceFeeManage": {
             "type": "object",
             "properties": {
@@ -13564,17 +14380,6 @@
                 "userId": {
                     "description": "鐢ㄦ埛ID",
                     "type": "string"
-                }
-            }
-        },
-        "request.DeleteserviceContract": {
-            "type": "object",
-            "properties": {
-                "ids": {
-                    "type": "array",
-                    "items": {
-                        "type": "integer"
-                    }
                 }
             }
         },
@@ -13682,7 +14487,7 @@
                     "type": "integer"
                 },
                 "search_map": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\"}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\"}",
                     "type": "object",
                     "additionalProperties": true
                 }
@@ -13729,9 +14534,6 @@
         "request.GetFollowRecordList": {
             "type": "object",
             "properties": {
-                "keyword": {
-                    "type": "string"
-                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -13739,6 +14541,11 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                },
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+                    "type": "object",
+                    "additionalProperties": true
                 }
             }
         },
@@ -13827,6 +14634,9 @@
             "properties": {
                 "keyword": {
                     "type": "string"
+                },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.SalesDetailsKeywordType"
                 },
                 "page": {
                     "description": "椤电爜",
@@ -13948,6 +14758,28 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                }
+            }
+        },
+        "request.GetServiceOrderList": {
+            "type": "object",
+            "properties": {
+                "keyword": {
+                    "type": "string"
+                },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.ServiceOrderKeywordType"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "queryClass": {
+                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
                 }
             }
         },
@@ -14156,7 +14988,7 @@
                 "signTime": {
                     "type": "string"
                 },
-                "wechatOrderStatus": {
+                "wechatOrderStatusId": {
                     "type": "integer"
                 }
             }
@@ -14164,7 +14996,8 @@
         "request.SalesRefund": {
             "type": "object",
             "properties": {
-                "accountId": {
+                "bankAccountId": {
+                    "description": "璐︽埛id",
                     "type": "integer"
                 },
                 "clientId": {
@@ -14179,6 +15012,10 @@
                 "number": {
                     "type": "string"
                 },
+                "paymentTypeId": {
+                    "description": "鏀舵鏂瑰紡ID",
+                    "type": "integer"
+                },
                 "products": {
                     "type": "array",
                     "items": {
@@ -14191,8 +15028,17 @@
                 "refundDate": {
                     "type": "string"
                 },
-                "refundMethod": {
-                    "type": "string"
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.RefundSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -14209,22 +15055,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": "閫�璐х姸鎬乮d",
                     "type": "integer"
+                },
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -14890,6 +15752,9 @@
         },
         "request.UpdateInvoice": {
             "type": "object",
+            "required": [
+                "id"
+            ],
             "properties": {
                 "clientId": {
                     "description": "瀹㈡埛id",
@@ -14925,6 +15790,13 @@
                 "principalId": {
                     "description": "閿�鍞礋璐d汉id",
                     "type": "integer"
+                },
+                "products": {
+                    "description": "鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Product"
+                    }
                 },
                 "sourceId": {
                     "description": "婧愬崟id",
@@ -15268,6 +16140,13 @@
         "request.UpdateReceipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -15287,9 +16166,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -15309,7 +16199,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -15824,6 +16718,18 @@
                     "description": "閲戦",
                     "type": "number"
                 },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountTotal": {
+                    "description": "鎬婚",
+                    "type": "number"
+                },
                 "collectionDate": {
                     "description": "璁″垝鏀舵鏃ユ湡",
                     "type": "string"
@@ -15861,10 +16767,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"
@@ -15879,14 +16789,14 @@
         },
         "request.UpdateServiceContract": {
             "type": "object",
+            "required": [
+                "memberId"
+            ],
             "properties": {
                 "clientId": {
                     "type": "integer"
                 },
                 "contactId": {
-                    "type": "integer"
-                },
-                "contractId": {
                     "type": "integer"
                 },
                 "endTime": {
@@ -15914,6 +16824,9 @@
                     "type": "string"
                 },
                 "saleChanceId": {
+                    "type": "integer"
+                },
+                "salesDetailsId": {
                     "type": "integer"
                 },
                 "serviceTimes": {
@@ -16260,6 +17173,17 @@
                 }
             }
         },
+        "request.UpdateServiceOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "request.UpdateServiceType": {
             "type": "object",
             "properties": {
@@ -16421,6 +17345,17 @@
                 }
             }
         },
+        "request.UpdateWechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "response.AccountIdResponse": {
             "type": "object",
             "properties": {

--
Gitblit v1.8.0