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/swagger.yaml |  210 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 207 insertions(+), 3 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index fb0cc54..f9f1d1f 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
@@ -238,6 +252,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:
@@ -1079,6 +1105,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:
@@ -1107,6 +1145,8 @@
         type: array
       remark:
         type: string
+      saleChance:
+        $ref: '#/definitions/model.SaleChance'
       saleChanceId:
         type: integer
       saleType:
@@ -1114,6 +1154,8 @@
       signTime:
         type: string
       wechatOrderStatus:
+        $ref: '#/definitions/model.WechatOrderStatus'
+      wechatOrderStatusId:
         type: integer
     type: object
   model.SalesLeads:
@@ -1599,6 +1641,13 @@
       username:
         type: string
       uuid:
+        type: string
+    type: object
+  model.WechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
         type: string
     type: object
   product.Product:
@@ -2248,8 +2297,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:
@@ -2362,6 +2445,8 @@
         type: string
       typeId:
         type: integer
+    required:
+    - memberId
     type: object
   request.AddServiceContractStatus:
     properties:
@@ -2639,6 +2724,13 @@
     - userId
     - vettingId
     - vettingType
+    type: object
+  request.AddWechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   request.Assign:
     properties:
@@ -2991,6 +3083,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesDetailsKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3215,7 +3309,7 @@
         type: integer
       signTime:
         type: string
-      wechatOrderStatus:
+      wechatOrderStatusId:
         type: integer
     type: object
   request.SalesRefund:
@@ -4416,6 +4510,8 @@
         type: string
       typeId:
         type: integer
+    required:
+    - memberId
     type: object
   request.UpdateServiceContractStatus:
     properties:
@@ -4750,6 +4846,13 @@
     required:
     - id
     - status
+    type: object
+  request.UpdateWechatOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   response.AccountIdResponse:
     properties:
@@ -11191,4 +11294,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