增加交收开始结束时间字段

controllers/erms3/spotContract.go

@@ -36,12 +36,14 @@ type SpotPriceOrder struct {
 
 // SpotPointOrder 点价明细
 type SpotPointOrder struct {
-	GoodsID   int32     `json:"goodsid" binding:"required"`   // 商品ID
-	GoodsName string    `json:"goodsname"`                    // 商品名称
-	Qty       float64   `json:"qty" binding:"required"`       // 数量
-	Basic     float64   `json:"basic" binding:"required"`     // 基差
-	StartDate time.Time `json:"startdate" binding:"required"` // 点价开始日期
-	EndDate   time.Time `json:"enddate" binding:"required"`   // 点价结束日期
+	GoodsID           int32     `json:"goodsid" binding:"required"`           // 商品ID
+	GoodsName         string    `json:"goodsname"`                            // 商品名称
+	Qty               float64   `json:"qty" binding:"required"`               // 数量
+	Basic             float64   `json:"basic" binding:"required"`             // 基差
+	StartDate         time.Time `json:"startdate" binding:"required"`         // 点价开始日期
+	EndDate           time.Time `json:"enddate" binding:"required"`           // 点价结束日期
+	DeliveryStartDate time.Time `json:"deliverystartdate" binding:"required"` // 交收开始日期
+	DeliveryEndDate   time.Time `json:"deliveryendtdate" binding:"required"`  // 交收结束日期
 }
 
 // SoptContractDetail 合同明细信息

docs/docs.go

@@ -4812,6 +4812,8 @@ var doc = `{
             "type": "object",
             "required": [
                 "basic",
+                "deliveryendtdate",
+                "deliverystartdate",
                 "enddate",
                 "goodsid",
                 "qty",
@@ -4822,6 +4824,14 @@ var doc = `{
                     "description": "基差",
                     "type": "number"
                 },
+                "deliveryendtdate": {
+                    "description": "交收结束日期",
+                    "type": "string"
+                },
+                "deliverystartdate": {
+                    "description": "交收开始日期",
+                    "type": "string"
+                },
                 "enddate": {
                     "description": "点价结束日期",
                     "type": "string"

docs/swagger.json

@@ -4796,6 +4796,8 @@
             "type": "object",
             "required": [
                 "basic",
+                "deliveryendtdate",
+                "deliverystartdate",
                 "enddate",
                 "goodsid",
                 "qty",
@@ -4806,6 +4808,14 @@
                     "description": "基差",
                     "type": "number"
                 },
+                "deliveryendtdate": {
+                    "description": "交收结束日期",
+                    "type": "string"
+                },
+                "deliverystartdate": {
+                    "description": "交收开始日期",
+                    "type": "string"
+                },
                 "enddate": {
                     "description": "点价结束日期",
                     "type": "string"

docs/swagger.yaml

@@ -1424,6 +1424,12 @@ definitions:
       basic:
         description: 基差
         type: number
+      deliveryendtdate:
+        description: 交收结束日期
+        type: string
+      deliverystartdate:
+        description: 交收开始日期
+        type: string
       enddate:
         description: 点价结束日期
         type: string
@@ -1441,6 +1447,8 @@ definitions:
         type: string
     required:
     - basic
+    - deliveryendtdate
+    - deliverystartdate
     - enddate
     - goodsid
     - qty