From 012da13206f2e4d6a3871b050c71a3b237878424 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/docs.go |  319 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 316 insertions(+), 3 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index aa46c54..c23e327 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -9513,6 +9513,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": {
@@ -9686,6 +9849,23 @@
                 "ReceiptQueryClassExpireLessThen60Days"
             ]
         },
+        "constvar.SalesDetailsKeywordType": {
+            "type": "string",
+            "enum": [
+                "瀹㈡埛鍚嶇О",
+                "璁㈠崟缂栧彿",
+                "绛剧害鏃ユ湡",
+                "閿�鍞礋璐d汉",
+                "浜у搧鍚嶇О"
+            ],
+            "x-enum-varnames": [
+                "SalesDetailsKeywordTypeCustomerName",
+                "SalesDetailsKeywordTypeOrderNumber",
+                "SalesDetailsKeywordTypeSignTime",
+                "SalesDetailsKeywordTypePrincipal",
+                "SalesDetailsKeywordTypeProductName"
+            ]
+        },
         "constvar.SalesStatus": {
             "type": "integer",
             "enum": [
@@ -9831,6 +10011,24 @@
                 "UserTypeSuper",
                 "UserTypePrimary",
                 "UserTypeSub"
+            ]
+        },
+        "constvar.WechatOrderStatusKeywordType": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "WechatOrderStatusKeywordCustomerName"
+            ]
+        },
+        "constvar.WechatOrderStatusQueryClass": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "WechatOrderStatusQueryClassExpireLessThen60Days"
             ]
         },
         "contextx.Response": {
@@ -11109,6 +11307,22 @@
                 "addressee": {
                     "type": "string"
                 },
+                "amountInvoiced": {
+                    "description": "宸插紑绁ㄩ噾棰�",
+                    "type": "number"
+                },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountUnInvoiced": {
+                    "description": "鏈紑绁ㄩ噾棰�",
+                    "type": "number"
+                },
                 "client": {
                     "$ref": "#/definitions/model.Client"
                 },
@@ -11151,6 +11365,9 @@
                 "remark": {
                     "type": "string"
                 },
+                "saleChance": {
+                    "$ref": "#/definitions/model.SaleChance"
+                },
                 "saleChanceId": {
                     "type": "integer"
                 },
@@ -11161,6 +11378,9 @@
                     "type": "string"
                 },
                 "wechatOrderStatus": {
+                    "$ref": "#/definitions/model.WechatOrderStatus"
+                },
+                "wechatOrderStatusId": {
                     "type": "integer"
                 }
             }
@@ -11880,6 +12100,17 @@
                     "type": "string"
                 },
                 "uuid": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.WechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
                     "type": "string"
                 }
             }
@@ -12845,8 +13076,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"
                 }
             }
         },
@@ -12964,6 +13246,9 @@
         },
         "request.AddServiceContract": {
             "type": "object",
+            "required": [
+                "memberId"
+            ],
             "properties": {
                 "clientId": {
                     "type": "integer"
@@ -13412,6 +13697,17 @@
                 },
                 "vettingType": {
                     "type": "integer"
+                }
+            }
+        },
+        "request.AddWechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
                 }
             }
         },
@@ -13912,6 +14208,9 @@
                 "keyword": {
                     "type": "string"
                 },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.SalesDetailsKeywordType"
+                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14240,7 +14539,7 @@
                 "signTime": {
                     "type": "string"
                 },
-                "wechatOrderStatus": {
+                "wechatOrderStatusId": {
                     "type": "integer"
                 }
             }
@@ -15973,6 +16272,9 @@
         },
         "request.UpdateServiceContract": {
             "type": "object",
+            "required": [
+                "memberId"
+            ],
             "properties": {
                 "clientId": {
                     "type": "integer"
@@ -16515,6 +16817,17 @@
                 }
             }
         },
+        "request.UpdateWechatOrderStatus": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "response.AccountIdResponse": {
             "type": "object",
             "properties": {

--
Gitblit v1.8.0