From 4e8d946913165901f25bb79add011d3c2df19792 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 14:30:29 +0800
Subject: [PATCH] fix

---
 docs/swagger.yaml |  492 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 470 insertions(+), 22 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 632c09c..bd69224 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -114,6 +114,20 @@
     type: string
     x-enum-varnames:
     - ReceiptQueryClassExpireLessThen60Days
+  constvar.SalesDetailsKeywordType:
+    enum:
+    - 瀹㈡埛鍚嶇О
+    - 璁㈠崟缂栧彿
+    - 绛剧害鏃ユ湡
+    - 閿�鍞礋璐ｄ汉
+    - 浜у搧鍚嶇О
+    type: string
+    x-enum-varnames:
+    - SalesDetailsKeywordTypeCustomerName
+    - SalesDetailsKeywordTypeOrderNumber
+    - SalesDetailsKeywordTypeSignTime
+    - SalesDetailsKeywordTypePrincipal
+    - SalesDetailsKeywordTypeProductName
   constvar.SalesStatus:
     enum:
     - 0
@@ -224,6 +238,44 @@
     - ServiceFollowupKeywordCustomerServiceNo
     - ServiceFollowupKeywordVisitor
     - ServiceFollowupKeywordSatisfactionDegree
+  constvar.ServiceOrderKeywordType:
+    enum:
+    - 鏈嶅姟鍗曠紪鍙�
+    - 涓婚
+    - 瀹㈡埛鍚嶇О
+    - 瀹為檯澶勭悊鏃堕棿
+    - 鏈嶅姟浜哄憳
+    - 鏈嶅姟鏂瑰紡
+    - 浜у搧绫诲埆
+    - 鏁呴殰绫诲埆
+    type: string
+    x-enum-varnames:
+    - ServiceOrderKeywordOrderNumber
+    - ServiceOrderKeywordSubject
+    - ServiceOrderKeywordClientName
+    - ServiceOrderKeywordRealProcessTime
+    - ServiceOrderKeywordServiceMan
+    - ServiceOrderKeywordServiceType
+    - ServiceOrderKeywordProductType
+    - ServiceOrderKeywordFaultType
+  constvar.ServiceOrderQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderQueryClassExpireLessThen60Days
+  constvar.ServiceOrderStatusKeywordType:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderStatusKeywordCustomerName
+  constvar.ServiceOrderStatusQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderStatusQueryClassExpireLessThen60Days
   constvar.UserType:
     enum:
     - 1
@@ -238,6 +290,18 @@
     - UserTypeSuper
     - UserTypePrimary
     - UserTypeSub
+  constvar.WechatOrderStatusKeywordType:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - WechatOrderStatusKeywordCustomerName
+  constvar.WechatOrderStatusQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - WechatOrderStatusQueryClassExpireLessThen60Days
   contextx.Response:
     properties:
       code:
@@ -670,6 +734,10 @@
       principalId:
         description: 閿�鍞礋璐ｄ汉id
         type: integer
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       sourceId:
         description: 婧愬崟id
         type: integer
@@ -832,7 +900,7 @@
   model.Product:
     properties:
       amount:
-        type: integer
+        type: number
       desc:
         type: string
       id:
@@ -895,6 +963,9 @@
     type: object
   model.Receipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: string
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -1075,6 +1146,18 @@
         type: string
       addressee:
         type: string
+      amountInvoiced:
+        description: 宸插紑绁ㄩ噾棰�
+        type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountUnInvoiced:
+        description: 鏈紑绁ㄩ噾棰�
+        type: number
       client:
         $ref: '#/definitions/model.Client'
       clientId:
@@ -1103,6 +1186,8 @@
         type: array
       remark:
         type: string
+      saleChance:
+        $ref: '#/definitions/model.SaleChance'
       saleChanceId:
         type: integer
       saleType:
@@ -1110,6 +1195,8 @@
       signTime:
         type: string
       wechatOrderStatus:
+        $ref: '#/definitions/model.WechatOrderStatus'
+      wechatOrderStatusId:
         type: integer
     type: object
   model.SalesLeads:
@@ -1270,6 +1357,8 @@
     type: object
   model.ServiceContract:
     properties:
+      SaleChance:
+        $ref: '#/definitions/model.SaleChance'
       amountInvoiced:
         description: 宸插紑绁ㄩ噾棰�
         type: number
@@ -1279,11 +1368,16 @@
       amountReceived:
         description: 宸叉敹閲戦
         type: number
+      amountUnInvoiced:
+        description: 鏈紑绁ㄩ噾棰�
+        type: number
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      contact:
+        $ref: '#/definitions/model.Contact'
       contactId:
-        type: integer
-      contractId:
         type: integer
       endTime:
         type: string
@@ -1297,14 +1391,24 @@
         items:
           $ref: '#/definitions/model.Product'
         type: array
+      quotation:
+        $ref: '#/definitions/model.Quotation'
       quotationId:
         type: integer
       remark:
         type: string
       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
       serviceTimes:
@@ -1349,8 +1453,14 @@
     type: object
   model.ServiceFollowup:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      contact:
+        $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
       customerServiceSheet:
@@ -1359,26 +1469,36 @@
         type: string
       id:
         type: integer
+      isVisit:
+        $ref: '#/definitions/model.IsVisit'
       isVisitId:
         type: integer
       memberId:
         type: integer
       number:
         type: string
+      oldMember:
+        $ref: '#/definitions/model.User'
       oldMemberId:
         type: integer
       planId:
         type: integer
       remark:
         type: string
+      satisfaction:
+        $ref: '#/definitions/model.Satisfaction'
       satisfactionId:
         type: integer
       serviceId:
         type: integer
       serviceOrder:
         $ref: '#/definitions/model.ServiceOrder'
+      solveRate:
+        $ref: '#/definitions/model.SolveRate'
       solveRateId:
         type: integer
+      timelyRate:
+        $ref: '#/definitions/model.TimelyRate'
       timelyRateId:
         type: integer
     type: object
@@ -1391,10 +1511,12 @@
         description: 棰勭害涓婇棬鏃堕棿
         type: string
       carFare:
-        description: 浜ら�氳垂
+        description: 浜ら�氳垂                                                                 //
+          浜ら�氳垂
         type: number
       chargeAmount:
-        description: 鏀惰垂閲戦
+        description: 鏀惰垂閲戦                                                       //
+          鏀惰垂閲戦
         type: number
       client:
         $ref: '#/definitions/model.Client'
@@ -1461,6 +1583,8 @@
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatus:
+        $ref: '#/definitions/model.ServiceOrderStatus'
       serviceType:
         $ref: '#/definitions/model.ServiceType'
       serviceTypeId:
@@ -1485,6 +1609,13 @@
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+    type: object
+  model.ServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   model.ServiceType:
     properties:
@@ -1580,6 +1711,13 @@
       username:
         type: string
       uuid:
+        type: string
+    type: object
+  model.WechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
         type: string
     type: object
   product.Product:
@@ -1906,6 +2044,11 @@
       principalId:
         description: 閿�鍞礋璐ｄ汉id
         type: integer
+      products:
+        description: 鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       sourceId:
         description: 婧愬崟id
         type: integer
@@ -2053,6 +2196,9 @@
     type: object
   request.AddReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: string
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -2212,8 +2358,42 @@
     type: object
   request.AddSalesDetails:
     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:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
+      remark:
+        type: string
+      saleChanceId:
+        type: integer
+      saleType:
+        type: integer
+      signTime:
+        type: string
+      wechatOrderStatusId:
+        type: integer
     type: object
   request.AddSalesLeads:
     properties:
@@ -2296,8 +2476,6 @@
         type: integer
       contactId:
         type: integer
-      contractId:
-        type: integer
       endTime:
         type: string
       memberId:
@@ -2314,6 +2492,8 @@
         type: string
       saleChanceId:
         type: integer
+      salesDetailsId:
+        type: integer
       serviceTimes:
         type: integer
       signTime:
@@ -2326,6 +2506,8 @@
         type: string
       typeId:
         type: integer
+    required:
+    - memberId
     type: object
   request.AddServiceContractStatus:
     properties:
@@ -2528,6 +2710,13 @@
         description: 鑺辫垂鏃堕棿
         type: integer
     type: object
+  request.AddServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
+    type: object
   request.AddServiceType:
     properties:
       id:
@@ -2603,6 +2792,13 @@
     - userId
     - vettingId
     - vettingType
+    type: object
+  request.AddWechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   request.Assign:
     properties:
@@ -2746,6 +2942,13 @@
           type: integer
         type: array
     type: object
+  request.DeleteServiceContract:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    type: object
   request.DeleteServiceFeeManage:
     properties:
       ids:
@@ -2765,13 +2968,6 @@
       userId:
         description: 鐢ㄦ埛ID
         type: string
-    type: object
-  request.DeleteserviceContract:
-    properties:
-      ids:
-        items:
-          type: integer
-        type: array
     type: object
   request.DownloadFile:
     properties:
@@ -2955,6 +3151,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesDetailsKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3041,6 +3239,21 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+    type: object
+  request.GetServiceOrderList:
+    properties:
+      keyword:
+        type: string
+      keywordType:
+        $ref: '#/definitions/constvar.ServiceOrderKeywordType'
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+      queryClass:
+        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
     type: object
   request.GetSubOrderList:
     properties:
@@ -3179,7 +3392,7 @@
         type: integer
       signTime:
         type: string
-      wechatOrderStatus:
+      wechatOrderStatusId:
         type: integer
     type: object
   request.SalesRefund:
@@ -3701,6 +3914,11 @@
       principalId:
         description: 閿�鍞礋璐ｄ汉id
         type: integer
+      products:
+        description: 鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       sourceId:
         description: 婧愬崟id
         type: integer
@@ -3713,6 +3931,8 @@
       taxpayerIdNumber:
         description: 绾崇◣璇嗗埆鍙�
         type: string
+    required:
+    - id
     type: object
   request.UpdateInvoiceStatus:
     properties:
@@ -3926,6 +4146,9 @@
     type: object
   request.UpdateReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: string
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -4341,8 +4564,6 @@
         type: integer
       contactId:
         type: integer
-      contractId:
-        type: integer
       endTime:
         type: string
       id:
@@ -4361,6 +4582,8 @@
         type: string
       saleChanceId:
         type: integer
+      salesDetailsId:
+        type: integer
       serviceTimes:
         type: integer
       signTime:
@@ -4373,6 +4596,8 @@
         type: string
       typeId:
         type: integer
+    required:
+    - memberId
     type: object
   request.UpdateServiceContractStatus:
     properties:
@@ -4603,6 +4828,13 @@
         description: 鑺辫垂鏃堕棿
         type: integer
     type: object
+  request.UpdateServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
+    type: object
   request.UpdateServiceType:
     properties:
       id:
@@ -4707,6 +4939,13 @@
     required:
     - id
     - status
+    type: object
+  request.UpdateWechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   response.AccountIdResponse:
     properties:
@@ -9980,7 +10219,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.DeleteserviceContract'
+          $ref: '#/definitions/request.DeleteServiceContract'
       produces:
       - application/json
       responses:
@@ -10012,7 +10251,7 @@
                 data:
                   $ref: '#/definitions/response.ServiceContractsResponse'
               type: object
-      summary: 鐢熸垚璁″垝鍒楄〃
+      summary: 鏈嶅姟鍚堝悓鍒楄〃
       tags:
       - ServiceContract
   /api/serviceContract/update:
@@ -10380,7 +10619,14 @@
       tags:
       - 鏈嶅姟鍗曠鐞�
   /api/serviceOrder/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetServiceOrderList'
       produces:
       - application/json
       responses:
@@ -10417,6 +10663,107 @@
       summary: 鏇存柊鏈嶅姟鍗�
       tags:
       - 鏈嶅姟鍗曠鐞�
+  /api/serviceOrderStatus/add:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddServiceOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 娣诲姞鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/delete/{id}:
+    delete:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鍒犻櫎鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/list:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - enum:
+        - ""
+        in: query
+        name: keywordType
+        type: string
+        x-enum-varnames:
+        - ServiceOrderStatusKeywordCustomerName
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - enum:
+        - ""
+        in: query
+        name: queryClass
+        type: string
+        x-enum-varnames:
+        - ServiceOrderStatusQueryClassExpireLessThen60Days
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.ListResponse'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/model.ServiceOrderStatus'
+                  type: array
+              type: object
+      summary: 鑾峰彇鏈嶅姟鍗曠姸鎬佸垪琛�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/update:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateServiceOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鏇存柊鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
   /api/serviceType/add:
     post:
       parameters:
@@ -11129,4 +11476,105 @@
       summary: 鏇存柊瀹℃壒
       tags:
       - Vetting
+  /api/wechatOrderStatus/add:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddWechatOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 娣诲姞寰俊璁㈠崟鐘舵��
+      tags:
+      - 寰俊璁㈠崟鐘舵��
+  /api/wechatOrderStatus/delete/{id}:
+    delete:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鍒犻櫎寰俊璁㈠崟鐘舵��
+      tags:
+      - 寰俊璁㈠崟鐘舵��
+  /api/wechatOrderStatus/list:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - enum:
+        - ""
+        in: query
+        name: keywordType
+        type: string
+        x-enum-varnames:
+        - WechatOrderStatusKeywordCustomerName
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - enum:
+        - ""
+        in: query
+        name: queryClass
+        type: string
+        x-enum-varnames:
+        - WechatOrderStatusQueryClassExpireLessThen60Days
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.ListResponse'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/model.WechatOrderStatus'
+                  type: array
+              type: object
+      summary: 鑾峰彇寰俊璁㈠崟鐘舵�佸垪琛�
+      tags:
+      - 寰俊璁㈠崟鐘舵��
+  /api/wechatOrderStatus/update:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateWechatOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鏇存柊寰俊璁㈠崟鐘舵��
+      tags:
+      - 寰俊璁㈠崟鐘舵��
 swagger: "2.0"

--
Gitblit v1.8.0