From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/swagger.yaml |  326 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 269 insertions(+), 57 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 6e74083..3bb3424 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -164,6 +164,28 @@
     - SalesDetailsKeywordTypeSignTime
     - SalesDetailsKeywordTypePrincipal
     - SalesDetailsKeywordTypeProductName
+  constvar.SalesRefundKeywordType:
+    enum:
+    - 閿�鍞��璐у崟缂栧彿
+    - 瀹㈡埛鍚嶇О
+    - 閫�娆炬棩鏈�
+    - 璐︽埛
+    - 鏄惁寮�绁�
+    - 浠樻鏂瑰紡
+    - 閿�鍞礋璐ｄ汉
+    - 淇敼鏃堕棿
+    - 浠风◣鍚堣
+    type: string
+    x-enum-varnames:
+    - SalesRefundKeywordRefundNumber
+    - SalesRefundKeywordClientName
+    - SalesRefundKeywordRefundDate
+    - SalesRefundKeywordAccount
+    - SalesRefundKeywordIsInvoice
+    - SalesRefundKeywordPaymentType
+    - SalesRefundKeywordPrincipal
+    - SalesRefundKeywordUpdateAt
+    - SalesRefundKeywordPriceTotal
   constvar.SalesReturnSourceType:
     enum:
     - 1
@@ -508,6 +530,39 @@
       name:
         type: string
     type: object
+  model.CollectionProjection:
+    properties:
+      created_at:
+        description: |-
+          The date when the item was created
+          example: 2023-08-10 15:48:25
+        type: string
+      creator:
+        type: integer
+      deleted_at:
+        description: |-
+          The date when the item was deleted
+          example: 2023-08-10 15:48:25
+        type: string
+      estimated_collection_amount:
+        type: number
+      estimated_collection_date:
+        type: string
+      id:
+        description: |-
+          The ID of the item
+          example: 1
+        type: integer
+      modifier:
+        type: integer
+      sale_chance_id:
+        type: integer
+      updated_at:
+        description: |-
+          The date when the item was last updated
+          example: 2023-08-10 15:48:25
+        type: string
+    type: object
   model.Contact:
     properties:
       birthday:
@@ -643,23 +698,6 @@
         type: integer
       name:
         type: string
-    type: object
-  model.CustomerServiceSheet:
-    properties:
-      handleStatus:
-        type: integer
-      id:
-        type: integer
-      memberId:
-        type: integer
-      number:
-        type: string
-      priority:
-        type: integer
-      serviceFollowupId:
-        type: integer
-      serviceMode:
-        type: integer
     type: object
   model.Department:
     properties:
@@ -989,6 +1027,10 @@
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       quotation_status_id:
         type: integer
       sale_chance:
@@ -1110,6 +1152,10 @@
         $ref: '#/definitions/model.Client'
       client_id:
         type: integer
+      collection_projections:
+        items:
+          $ref: '#/definitions/model.CollectionProjection'
+        type: array
       competitors:
         type: string
       contact:
@@ -1310,6 +1356,9 @@
     type: object
   model.SalesRefund:
     properties:
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
       bankAccount:
         $ref: '#/definitions/model.BankAccount'
       bankAccountId:
@@ -1319,10 +1368,16 @@
         $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       id:
         type: integer
       isInvoice:
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       memberId:
         type: integer
       number:
@@ -1578,8 +1633,6 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
-      customerServiceSheet:
-        $ref: '#/definitions/model.CustomerServiceSheet'
       file:
         type: string
       id:
@@ -1604,10 +1657,10 @@
         $ref: '#/definitions/model.Satisfaction'
       satisfactionId:
         type: integer
-      serviceId:
-        type: integer
       serviceOrder:
         $ref: '#/definitions/model.ServiceOrder'
+      serviceOrderId:
+        type: integer
       solveRate:
         $ref: '#/definitions/model.SolveRate'
       solveRateId:
@@ -1643,11 +1696,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contract:
-        $ref: '#/definitions/model.Contract'
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -1663,11 +1711,6 @@
         type: integer
       id:
         type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
-        type: integer
-      orderManage:
-        $ref: '#/definitions/model.OrderManage'
       priorityLevel:
         $ref: '#/definitions/model.PriorityLevel'
       priorityLevelId:
@@ -1691,6 +1734,16 @@
         $ref: '#/definitions/model.SaleChance'
       saleChanceId:
         description: 閿�鍞満浼歩d
+        type: integer
+      salesDetails:
+        $ref: '#/definitions/model.SalesDetails'
+      salesDetailsId:
+        description: 閿�鍞槑缁唅d
+        type: integer
+      serviceContract:
+        $ref: '#/definitions/model.ServiceContract'
+      serviceContractId:
+        description: 鏈嶅姟鍚堝悓id
         type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
@@ -1986,6 +2039,18 @@
         type: string
     required:
     - name
+    type: object
+  request.AddCollectionProjection:
+    properties:
+      estimated_collection_amount:
+        description: 棰勮鏀舵閲戦
+        type: number
+      estimated_collection_time:
+        description: 棰勮鏀舵鏃堕棿
+        type: string
+      sale_chance_id:
+        description: 閿�鍞満浼歩d
+        type: integer
     type: object
   request.AddContact:
     properties:
@@ -2295,6 +2360,10 @@
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       quotation_status_id:
         type: integer
       sale_chance_id:
@@ -2746,7 +2815,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -2773,9 +2842,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -2784,9 +2850,6 @@
         type: integer
       faultTypeId:
         description: 鏁呴殰绫诲埆id
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -2806,12 +2869,21 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatusId:
+        description: 澶勭悊鐘舵��
+        type: integer
       serviceTypeId:
         description: 鏈嶅姟鏂瑰紡id
         type: integer
@@ -2824,9 +2896,6 @@
       solutionRemark:
         description: 鍐呴儴澶囨敞
         type: string
-      status:
-        description: 澶勭悊鐘舵��
-        type: integer
       subject:
         description: 涓婚
         type: string
@@ -3218,14 +3287,18 @@
     type: object
   request.GetMasterOrderList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞�诲崟鍙�",
+          "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "start_time": "寮�濮嬫椂闂�", "end_time":
+          "缁撴潫鏃堕棿", "money": "鎬婚噾棰�", "member_name": "璐熻矗浜�"}'
+        type: object
     type: object
   request.GetOrderManageList:
     properties:
@@ -3251,25 +3324,34 @@
     type: object
   request.GetQuotationList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      searchMap:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
+          閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�",
+          "validity_date": "鏈夋晥鏈�"}'
+        type: object
     type: object
   request.GetSaleChanceList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "鏈轰細鍚嶇О",
+          "client_name": "瀹㈡埛鍚嶇О","number":"缂栧彿", "contact_name":"鑱旂郴浜哄鍚�", "member_name":
+          "閿�鍞礋璐ｄ汉", "status": "鐘舵��", "sale_stage": "闃舵", "possibilities": "鍙兘鎬�", "expected_time":
+          "棰勮鎴愪氦鏃堕棿", "budget": "璧勯噾缁濆鍊�", "projected_amount": "棰勮鍚堝悓閲戦"}'
+        type: object
     type: object
   request.GetSalesDetailsList:
     properties:
@@ -3303,6 +3385,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesRefundKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3363,6 +3447,9 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      serviceOrderId:
+        description: 鏈嶅姟鍥炶鍗昳d
+        type: integer
     type: object
   request.GetServiceOrderList:
     properties:
@@ -3378,6 +3465,10 @@
         type: integer
       queryClass:
         $ref: '#/definitions/constvar.ServiceOrderQueryClass'
+      salesDetailsId:
+        type: integer
+      serviceContractId:
+        type: integer
     type: object
   request.GetSubOrderList:
     properties:
@@ -3437,6 +3528,16 @@
         type: string
       subOrderId:
         type: integer
+    type: object
+  request.PushSaleChance:
+    properties:
+      id:
+        type: integer
+      step:
+        type: integer
+    required:
+    - id
+    - step
     type: object
   request.PushSalesLeads:
     properties:
@@ -3816,6 +3917,17 @@
         type: array
     required:
     - client_types
+    type: object
+  request.UpdateCollectionProjection:
+    properties:
+      estimated_collection_amount:
+        description: 棰勮鏀舵閲戦
+        type: number
+      estimated_collection_time:
+        description: 棰勮鏀舵鏃堕棿
+        type: string
+      id:
+        type: integer
     type: object
   request.UpdateContact:
     properties:
@@ -4262,6 +4374,10 @@
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       quotation_status_id:
         type: integer
       sale_chance_id:
@@ -4901,7 +5017,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -4928,9 +5044,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -4941,9 +5054,6 @@
         description: 鏁呴殰绫诲埆id
         type: integer
       id:
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -4963,12 +5073,21 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatusId:
+        description: 澶勭悊鐘舵��
+        type: integer
       serviceTypeId:
         description: 鏈嶅姟鏂瑰紡id
         type: integer
@@ -4981,9 +5100,6 @@
       solutionRemark:
         description: 鍐呴儴澶囨敞
         type: string
-      status:
-        description: 澶勭悊鐘舵��
-        type: integer
       subject:
         description: 涓婚
         type: string
@@ -6459,6 +6575,83 @@
       summary: 鏇存柊瀹㈡埛绫诲瀷
       tags:
       - ClientType
+  /api/collectionProjection/add:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddCollectionProjection'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 娣诲姞鏀舵棰勬祴
+      tags:
+      - CollectionProjection
+  /api/collectionProjection/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:
+      - CollectionProjection
+  /api/collectionProjection/list:
+    post:
+      parameters:
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鑾峰彇鏀舵棰勬祴鍒楄〃
+      tags:
+      - CollectionProjection
+  /api/collectionProjection/update:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateCollectionProjection'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鏇存柊鏀舵棰勬祴
+      tags:
+      - CollectionProjection
   /api/contact/add:
     post:
       parameters:
@@ -9551,6 +9744,25 @@
       summary: 閿�鍞満浼氬垪琛�
       tags:
       - SaleChance
+  /api/saleChance/push:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.PushSaleChance'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鎺ㄨ繘閿�鍞満浼�
+      tags:
+      - SaleChance
   /api/saleChance/update:
     put:
       parameters:

--
Gitblit v1.8.0