Parcourir la source

/Ferroalloy/QueryTHJPurchaseTransferDetail 增加出参

zhou.xiaoning il y a 3 ans
Parent
commit
9e80cc3adc
4 fichiers modifiés avec 28 ajouts et 2 suppressions
  1. 8 0
      docs/docs.go
  2. 8 0
      docs/swagger.json
  3. 6 0
      docs/swagger.yaml
  4. 6 2
      models/ferroalloy.go

+ 8 - 0
docs/docs.go

@@ -44201,6 +44201,14 @@ const docTemplate = `{
                     "description": "预售结束日期",
                     "type": "string"
                 },
+                "endmonth": {
+                    "description": "交收月份(yyyy-mm)",
+                    "type": "string"
+                },
+                "takestartdate": {
+                    "description": "提货开始日期",
+                    "type": "string"
+                },
                 "tradeprice": {
                     "description": "摘牌价格",
                     "type": "number"

+ 8 - 0
docs/swagger.json

@@ -44192,6 +44192,14 @@
                     "description": "预售结束日期",
                     "type": "string"
                 },
+                "endmonth": {
+                    "description": "交收月份(yyyy-mm)",
+                    "type": "string"
+                },
+                "takestartdate": {
+                    "description": "提货开始日期",
+                    "type": "string"
+                },
                 "tradeprice": {
                     "description": "摘牌价格",
                     "type": "number"

+ 6 - 0
docs/swagger.yaml

@@ -18544,6 +18544,12 @@ definitions:
       enddate:
         description: 预售结束日期
         type: string
+      endmonth:
+        description: 交收月份(yyyy-mm)
+        type: string
+      takestartdate:
+        description: 提货开始日期
+        type: string
       tradeprice:
         description: 摘牌价格
         type: number

+ 6 - 2
models/ferroalloy.go

@@ -1146,7 +1146,9 @@ type THJPurchaseTradeDetail_Goodsinfo struct {
 }
 
 type THJPurchaseTradeDetail_Date struct {
-	ENDDATE string `json:"enddate" xorm:"ENDDATE"` // 预售结束日期
+	ENDMONTH      string `json:"endmonth" xorm:"ENDMONTH"`           // 交收月份(yyyy-mm)
+	TAKESTARTDATE string `json:"takestartdate" xorm:"TAKESTARTDATE"` // 提货开始日期
+	ENDDATE       string `json:"enddate" xorm:"ENDDATE"`             // 预售结束日期
 
 	DEPOSITRATE float64 `json:"depositrate" xorm:"DEPOSITRATE"` // 定金比例
 	TRADEPRICE  float64 `json:"tradeprice" xorm:"TRADEPRICE"`   // 摘牌价格
@@ -1210,7 +1212,9 @@ func (r *THJPurchaseTradeDetailReq) GetData() (rsp *THJPurchaseTradeDetailRsp, e
 	deliveryDates := make([]THJPurchaseTradeDetail_Date, 0)
 	sql = fmt.Sprintf(`
 	select 
-		pi.ENDDATE,
+		to_char(pi.TAKESTARTDATE, 'yyyy-mm') ENDMONTH,
+		to_char(pi.TAKESTARTDATE, 'yyyy-mm-dd') TAKESTARTDATE,
+		to_char(pi.ENDDATE, 'yyyy-mm-dd') ENDDATE,
 		td.DEPOSITRATE,
 		td.TRADEPRICE,
 		td.TRADEQTY,