From cd9a3c446cff66e589cdb26163c3e2baf4bc6a1e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 13:37:19 +0800
Subject: [PATCH] fix

---
 model/salesReturn.go |    2 
 docs/swagger.yaml    |   43 +++++++++-----
 constvar/number.go   |    5 +
 docs/docs.go         |   54 ++++++++++++++----
 docs/swagger.json    |   54 ++++++++++++++----
 5 files changed, 118 insertions(+), 40 deletions(-)

diff --git a/constvar/number.go b/constvar/number.go
new file mode 100644
index 0000000..fd13d8a
--- /dev/null
+++ b/constvar/number.go
@@ -0,0 +1,5 @@
+package constvar
+
+const (
+	NumberPrefixOfReceipt = "skd"
+)
diff --git a/docs/docs.go b/docs/docs.go
index a47945d..d67f59a 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -10836,10 +10836,6 @@
         "model.Client": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "business_scope": {
                     "type": "string"
                 },
@@ -11024,10 +11020,6 @@
         "model.CollectionProjection": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "created_at": {
                     "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                     "type": "string"
@@ -11216,10 +11208,6 @@
         "model.Contract": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "client": {
                     "$ref": "#/definitions/model.Client"
                 },
@@ -11880,6 +11868,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -11889,6 +11883,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -11929,6 +11926,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -12497,6 +12497,9 @@
                     "description": "閫�璐х姸鎬乮d",
                     "type": "integer"
                 },
+                "source": {
+                    "$ref": "#/definitions/model.SalesDetails"
+                },
                 "sourceId": {
                     "description": "婧愬崟id",
                     "type": "integer"
@@ -12933,6 +12936,9 @@
                 },
                 "id": {
                     "type": "integer"
+                },
+                "number": {
+                    "type": "string"
                 },
                 "priorityLevel": {
                     "$ref": "#/definitions/model.PriorityLevel"
@@ -13986,6 +13992,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -13995,6 +14007,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -14035,6 +14050,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -17057,6 +17075,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -17066,6 +17090,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -17106,6 +17133,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.json b/docs/swagger.json
index c4d0f38..27d99f4 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -10824,10 +10824,6 @@
         "model.Client": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "business_scope": {
                     "type": "string"
                 },
@@ -11012,10 +11008,6 @@
         "model.CollectionProjection": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "created_at": {
                     "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                     "type": "string"
@@ -11204,10 +11196,6 @@
         "model.Contract": {
             "type": "object",
             "properties": {
-                "_": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
-                },
                 "client": {
                     "$ref": "#/definitions/model.Client"
                 },
@@ -11868,6 +11856,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -11877,6 +11871,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -11917,6 +11914,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -12485,6 +12485,9 @@
                     "description": "閫�璐х姸鎬乮d",
                     "type": "integer"
                 },
+                "source": {
+                    "$ref": "#/definitions/model.SalesDetails"
+                },
                 "sourceId": {
                     "description": "婧愬崟id",
                     "type": "integer"
@@ -12921,6 +12924,9 @@
                 },
                 "id": {
                     "type": "integer"
+                },
+                "number": {
+                    "type": "string"
                 },
                 "priorityLevel": {
                     "$ref": "#/definitions/model.PriorityLevel"
@@ -13974,6 +13980,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -13983,6 +13995,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -14023,6 +14038,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -17045,6 +17063,12 @@
                     "description": "瀹㈡埛id",
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "fileId": {
                     "description": "闄勪欢id",
                     "type": "integer"
@@ -17054,6 +17078,9 @@
                 },
                 "moneyType": {
                     "description": "甯佺",
+                    "type": "string"
+                },
+                "number": {
                     "type": "string"
                 },
                 "paymentType": {
@@ -17094,6 +17121,9 @@
                             "$ref": "#/definitions/constvar.ReceiptSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 4d0f444..04cab2b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -445,11 +445,6 @@
     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:
@@ -578,11 +573,6 @@
     type: object
   model.CollectionProjection:
     properties:
-      _:
-        description: |-
-          The date when the item was deleted
-          example: 2023-08-10 15:48:25
-        type: string
       created_at:
         description: |-
           The date when the item was created
@@ -714,11 +704,6 @@
     type: object
   model.Contract:
     properties:
-      _:
-        description: |-
-          The date when the item was deleted
-          example: 2023-08-10 15:48:25
-        type: string
       client:
         $ref: '#/definitions/model.Client'
       clientId:
@@ -1159,6 +1144,10 @@
       clientId:
         description: 瀹㈡埛id
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       fileId:
         description: 闄勪欢id
         type: integer
@@ -1166,6 +1155,8 @@
         type: integer
       moneyType:
         description: 甯佺
+        type: string
+      number:
         type: string
       paymentType:
         $ref: '#/definitions/model.PaymentType'
@@ -1192,6 +1183,8 @@
         allOf:
         - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
+      updateTime:
+        type: string
     type: object
   model.RefundMethod:
     properties:
@@ -1568,6 +1561,8 @@
       salesReturnStatusId:
         description: 閫�璐х姸鎬乮d
         type: integer
+      source:
+        $ref: '#/definitions/model.SalesDetails'
       sourceId:
         description: 婧愬崟id
         type: integer
@@ -1862,6 +1857,8 @@
         type: integer
       id:
         type: integer
+      number:
+        type: string
       priorityLevel:
         $ref: '#/definitions/model.PriorityLevel'
       priorityLevelId:
@@ -2572,6 +2569,10 @@
       clientId:
         description: 瀹㈡埛id
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       fileId:
         description: 闄勪欢id
         type: integer
@@ -2579,6 +2580,8 @@
         type: integer
       moneyType:
         description: 甯佺
+        type: string
+      number:
         type: string
       paymentType:
         $ref: '#/definitions/model.PaymentType'
@@ -2605,6 +2608,8 @@
         allOf:
         - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
+      updateTime:
+        type: string
     type: object
   request.AddRefundMethod:
     properties:
@@ -4675,6 +4680,10 @@
       clientId:
         description: 瀹㈡埛id
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       fileId:
         description: 闄勪欢id
         type: integer
@@ -4682,6 +4691,8 @@
         type: integer
       moneyType:
         description: 甯佺
+        type: string
+      number:
         type: string
       paymentType:
         $ref: '#/definitions/model.PaymentType'
@@ -4708,6 +4719,8 @@
         allOf:
         - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
+      updateTime:
+        type: string
     type: object
   request.UpdateRefundMethod:
     properties:
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 88af11a..e82a367 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -16,7 +16,7 @@
 		Client              Client                         `json:"client" gorm:"foreignKey:ClientId"`
 		SourceType          constvar.SalesReturnSourceType `gorm:"source_type" json:"sourceType"` // 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
 		SourceId            int                            `gorm:"source_id" json:"sourceId"`     // 婧愬崟id
-		Source              SalesDetails                   `gorm:"foreignKey:SourceId" json:"Source"`
+		Source              SalesDetails                   `gorm:"foreignKey:SourceId" json:"source"`
 		Number              string                         `json:"number" gorm:"column:number;type:varchar(255);comment:閫�璐у崟鍙�"`
 		Repository          string                         `json:"repository" gorm:"column:repository;type:varchar(255);comment:浠撳簱"`
 		MemberId            int                            `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`

--
Gitblit v1.8.0