From 5053e0347804728c63c5498e0aa18129822454cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 13:31:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

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

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 7ec1d54..4d0f444 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -116,18 +116,6 @@
     type: string
     x-enum-varnames:
     - PaymentTypeQueryClassExpireLessThen60Days
-  constvar.ReceiptKeywordType:
-    enum:
-    - ""
-    type: string
-    x-enum-varnames:
-    - ReceiptKeywordCustomerName
-  constvar.ReceiptQueryClass:
-    enum:
-    - ""
-    type: string
-    x-enum-varnames:
-    - ReceiptQueryClassExpireLessThen60Days
   constvar.ReceiptSourceType:
     enum:
     - 1
@@ -136,6 +124,12 @@
     - 4
     - 5
     type: integer
+    x-enum-comments:
+      ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t
+      ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝
+      ReceiptSourceTypeInvoice: 閿�鍞彂绁�
+      ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟
+      ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓
     x-enum-varnames:
     - ReceiptSourceTypeSalesDetails
     - ReceiptSourceTypeServiceContract
@@ -270,6 +264,18 @@
     - ServiceContractQueryClassExpireAfter60Day
     - ServiceContractQueryClassExpiredBefore15Day
     - ServiceContractQueryClassExpiredBefore60Day
+  constvar.ServiceContractStatusKeywordType:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceContractStatusKeywordCustomerName
+  constvar.ServiceContractStatusQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceContractStatusQueryClassExpireLessThen60Days
   constvar.ServiceFeeKeywordType:
     enum:
     - 瀹㈡埛鍚嶇О
@@ -439,6 +445,11 @@
     type: object
   model.Client:
     properties:
+      _:
+        description: |-
+          The date when the item was deleted
+          example: 2023-08-10 15:48:25
+        type: string
       business_scope:
         type: string
       city:
@@ -469,6 +480,13 @@
         $ref: '#/definitions/model.Country'
       country_id:
         type: integer
+      created_at:
+        description: |-
+          The date when the item was created
+          example: 2023-08-10 15:48:25
+        type: string
+      creator_id:
+        type: integer
       detail_address:
         type: string
       enterprise_nature_id:
@@ -484,6 +502,9 @@
           $ref: '#/definitions/model.FollowRecord'
         type: array
       id:
+        description: |-
+          The ID of the item
+          example: 1
         type: integer
       industry:
         $ref: '#/definitions/model.Industry'
@@ -521,6 +542,11 @@
         type: string
       service_member_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.ClientLevel:
     properties:
@@ -719,6 +745,8 @@
         $ref: '#/definitions/model.Quotation'
       quotationId:
         type: integer
+      serviceContractStatus:
+        $ref: '#/definitions/model.ServiceContractStatus'
       statusId:
         type: integer
       updated_at:
@@ -801,6 +829,8 @@
         $ref: '#/definitions/model.Contact'
       contact_id:
         type: integer
+      contact_information:
+        $ref: '#/definitions/model.ContactInformation'
       contact_information_id:
         type: integer
       content:
@@ -1122,6 +1152,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer
@@ -1379,6 +1413,8 @@
         type: integer
       signTime:
         type: string
+      updateTime:
+        type: string
       wechatOrderStatus:
         $ref: '#/definitions/model.WechatOrderStatus'
       wechatOrderStatusId:
@@ -1401,6 +1437,8 @@
       country_id:
         type: integer
       desc:
+        type: string
+      detail_address:
         type: string
       followRecord:
         items:
@@ -1435,6 +1473,8 @@
     type: object
   model.SalesRefund:
     properties:
+      Source:
+        $ref: '#/definitions/model.SalesReturn'
       amountTotal:
         description: 浠风◣鍚堣
         type: number
@@ -1481,6 +1521,8 @@
         allOf:
         - $ref: '#/definitions/constvar.RefundSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級
+      updateTime:
+        type: string
     type: object
   model.SalesReturn:
     properties:
@@ -1533,6 +1575,8 @@
         allOf:
         - $ref: '#/definitions/constvar.SalesReturnSourceType'
         description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+      updateTime:
+        type: string
     type: object
   model.SalesReturnStatus:
     properties:
@@ -1586,6 +1630,10 @@
       percent:
         description: 姣斾緥
         type: number
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 鏀舵璐熻矗浜篒D
       principalId:
         description: 鏀舵璐熻矗浜篒D
         type: integer
@@ -1634,6 +1682,10 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       endTime:
         type: string
       id:
@@ -1675,6 +1727,8 @@
       startTime:
         type: string
       terms:
+        type: string
+      updateTime:
         type: string
     type: object
   model.ServiceContractStatus:
@@ -1720,6 +1774,10 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       file:
         type: string
       id:
@@ -1756,6 +1814,8 @@
         $ref: '#/definitions/model.TimelyRate'
       timelyRateId:
         type: integer
+      updateTime:
+        type: string
     type: object
   model.ServiceOrder:
     properties:
@@ -1783,6 +1843,10 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -1869,6 +1933,8 @@
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+      updateTime:
+        type: string
     type: object
   model.ServiceOrderStatus:
     properties:
@@ -1995,10 +2061,16 @@
       MaterialMode:
         description: 鐗╂枡绫诲瀷
         type: string
+      MaxInventory:
+        description: 鏈�澶у簱瀛�
+        type: integer
       MinInventory:
         description: 瀹夊叏搴撳瓨
         type: integer
       Name:
+        type: string
+      Node:
+        description: 澶囨敞
         type: string
       Number:
         type: string
@@ -2008,6 +2080,12 @@
       SalePrice:
         description: 閿�鍞环鏍�
         type: number
+      Specs:
+        description: 瑙勬牸
+        type: string
+      Type:
+        description: 鍨嬪彿
+        type: string
       Unit:
         type: string
     type: object
@@ -2487,6 +2565,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer
@@ -2705,6 +2787,9 @@
       desc:
         description: 澶囨敞
         type: string
+      detail_address:
+        description: 璇︾粏鍦板潃
+        type: string
       member_id:
         description: 閿�鍞礋璐ｄ汉ID
         type: integer
@@ -2786,6 +2871,10 @@
         type: integer
       salesDetailsId:
         type: integer
+      serviceContractStatusId:
+        type: integer
+      serviceContractTypeId:
+        type: integer
       serviceTimes:
         type: integer
       signTime:
@@ -2803,10 +2892,10 @@
     type: object
   request.AddServiceContractStatus:
     properties:
+      id:
+        type: integer
       name:
         type: string
-    required:
-    - name
     type: object
   request.AddServiceContractType:
     properties:
@@ -3372,7 +3461,9 @@
         additionalProperties: true
         description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
           "phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
-          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆"}'
+          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆","representative":
+          "娉曞畾浠ｈ〃浜�", "registration_time": "娉ㄥ唽鏃堕棿", "business_scope": "缁忚惀鑼冨洿", "remark":
+          "澶囨敞", "not_admin":"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛"}'
         type: object
     type: object
   request.GetContactList:
@@ -3387,7 +3478,8 @@
         additionalProperties: true
         description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
           "phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
-          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉"}'
+          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉",
+          "client_id": "clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜�"}'
         type: object
     type: object
   request.GetContractList:
@@ -4576,6 +4668,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer
@@ -4859,6 +4955,9 @@
       desc:
         description: 澶囨敞
         type: string
+      detail_address:
+        description: 璇︾粏鍦板潃
+        type: string
       id:
         type: integer
       member_id:
@@ -4978,6 +5077,10 @@
       percent:
         description: 姣斾緥
         type: number
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 鏀舵璐熻矗浜篒D
       principalId:
         description: 鏀舵璐熻矗浜篒D
         type: integer
@@ -5025,6 +5128,10 @@
         type: integer
       salesDetailsId:
         type: integer
+      serviceContractStatusId:
+        type: integer
+      serviceContractTypeId:
+        type: integer
       serviceTimes:
         type: integer
       signTime:
@@ -5046,18 +5153,6 @@
         type: integer
       name:
         type: string
-    required:
-    - id
-    - name
-    type: object
-  request.UpdateServiceContractStatuss:
-    properties:
-      service_contract_status:
-        items:
-          $ref: '#/definitions/request.UpdateServiceContractStatus'
-        type: array
-    required:
-    - service_contract_status
     type: object
   request.UpdateServiceContractType:
     properties:
@@ -5926,13 +6021,6 @@
       list:
         items:
           $ref: '#/definitions/model.Satisfaction'
-        type: array
-    type: object
-  response.ServiceContractStatusResponse:
-    properties:
-      list:
-        items:
-          $ref: '#/definitions/model.ServiceContractStatus'
         type: array
     type: object
   response.ServiceContractTypeResponse:
@@ -9378,16 +9466,6 @@
   /api/receipt/list:
     get:
       parameters:
-      - in: query
-        name: keyword
-        type: string
-      - enum:
-        - ""
-        in: query
-        name: keywordType
-        type: string
-        x-enum-varnames:
-        - ReceiptKeywordCustomerName
       - description: 椤电爜
         in: query
         name: page
@@ -9396,13 +9474,30 @@
         in: query
         name: pageSize
         type: integer
+      - in: query
+        name: sourceId
+        type: integer
       - enum:
-        - ""
+        - 1
+        - 2
+        - 3
+        - 4
+        - 5
         in: query
-        name: queryClass
-        type: string
+        name: sourceType
+        type: integer
+        x-enum-comments:
+          ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t
+          ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝
+          ReceiptSourceTypeInvoice: 閿�鍞彂绁�
+          ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟
+          ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓
         x-enum-varnames:
-        - ReceiptQueryClassExpireLessThen60Days
+        - ReceiptSourceTypeSalesDetails
+        - ReceiptSourceTypeServiceContract
+        - ReceiptSourceTypeInvoice
+        - ReceiptSourceTypeCollectionPlan
+        - ReceiptSourceTypeChuKuDan
       produces:
       - application/json
       responses:
@@ -10158,7 +10253,12 @@
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/contextx.Response'
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/request.AddSalesDetails'
+              type: object
       summary: 娣诲姞閿�鍞槑缁�
       tags:
       - SalesDetails
@@ -10799,10 +10899,23 @@
   /api/serviceCollectionPlan/list:
     get:
       parameters:
-      - description: 鏈嶅姟鍚堝悓id
-        in: query
-        name: serviceContractId
+      - in: query
+        name: sourceId
+        required: true
         type: integer
+      - enum:
+        - 1
+        - 2
+        in: query
+        name: sourceType
+        required: true
+        type: integer
+        x-enum-comments:
+          CollectionSourceTypeSaleDetails: 閿�鍞槑缁�
+          CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓
+        x-enum-varnames:
+        - CollectionSourceTypeSaleDetails
+        - CollectionSourceTypeServiceContract
       produces:
       - application/json
       responses:
@@ -10936,9 +11049,9 @@
           description: OK
           schema:
             $ref: '#/definitions/contextx.Response'
-      summary: 娣诲姞鏈嶅姟鍚堝悓鐘舵��
+      summary: 娣诲姞鍚堝悓鐘舵��
       tags:
-      - ServiceContractStatus
+      - 鍚堝悓鐘舵��
   /api/serviceContractStatus/delete/{id}:
     delete:
       parameters:
@@ -10954,11 +11067,37 @@
           description: OK
           schema:
             $ref: '#/definitions/contextx.Response'
-      summary: 鍒犻櫎鏈嶅姟鍚堝悓鐘舵��
+      summary: 鍒犻櫎鍚堝悓鐘舵��
       tags:
-      - ServiceContractStatus
+      - 鍚堝悓鐘舵��
   /api/serviceContractStatus/list:
     get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - enum:
+        - ""
+        in: query
+        name: keywordType
+        type: string
+        x-enum-varnames:
+        - ServiceContractStatusKeywordCustomerName
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - enum:
+        - ""
+        in: query
+        name: queryClass
+        type: string
+        x-enum-varnames:
+        - ServiceContractStatusQueryClassExpireLessThen60Days
       produces:
       - application/json
       responses:
@@ -10966,14 +11105,16 @@
           description: OK
           schema:
             allOf:
-            - $ref: '#/definitions/contextx.Response'
+            - $ref: '#/definitions/response.ListResponse'
             - properties:
                 data:
-                  $ref: '#/definitions/response.ServiceContractStatusResponse'
+                  items:
+                    $ref: '#/definitions/model.ServiceContractStatus'
+                  type: array
               type: object
-      summary: 鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�
+      summary: 鑾峰彇鍚堝悓鐘舵�佸垪琛�
       tags:
-      - ServiceContractStatus
+      - 鍚堝悓鐘舵��
   /api/serviceContractStatus/update:
     put:
       parameters:
@@ -10982,7 +11123,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.UpdateServiceContractStatuss'
+          $ref: '#/definitions/request.UpdateServiceContractStatus'
       produces:
       - application/json
       responses:
@@ -10990,9 +11131,9 @@
           description: OK
           schema:
             $ref: '#/definitions/contextx.Response'
-      summary: 鏇存柊鏈嶅姟鍚堝悓鐘舵��
+      summary: 鏇存柊鍚堝悓鐘舵��
       tags:
-      - ServiceContractStatus
+      - 鍚堝悓鐘舵��
   /api/serviceContractType/add:
     post:
       parameters:

--
Gitblit v1.8.0