Переглянути джерело

我的出售接口增加尺寸出参

zhou.xiaoning 3 роки тому
батько
коміт
5f13af6df8
4 змінених файлів з 20 додано та 0 видалено
  1. 4 0
      docs/docs.go
  2. 4 0
      docs/swagger.json
  3. 3 0
      docs/swagger.yaml
  4. 9 0
      models/guangzuan.go

+ 4 - 0
docs/docs.go

@@ -33091,6 +33091,10 @@ const docTemplate = `{
                 "size3": {
                     "type": "string"
                 },
+                "sizedisplay": {
+                    "description": "尺寸",
+                    "type": "string"
+                },
                 "stonedesc": {
                     "type": "string"
                 },

+ 4 - 0
docs/swagger.json

@@ -33082,6 +33082,10 @@
                 "size3": {
                     "type": "string"
                 },
+                "sizedisplay": {
+                    "description": "尺寸",
+                    "type": "string"
+                },
                 "stonedesc": {
                     "type": "string"
                 },

+ 3 - 0
docs/swagger.yaml

@@ -12162,6 +12162,9 @@ definitions:
         type: string
       size3:
         type: string
+      sizedisplay:
+        description: 尺寸
+        type: string
       stonedesc:
         type: string
       totalqty:

+ 9 - 0
models/guangzuan.go

@@ -986,6 +986,7 @@ type MySellOrder struct {
 	STONEDESC                  string  `json:"stonedesc" xorm:"STONEDESC"`                                   //
 	SETTINGMATERIAL            string  `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       //
 	PRICE                      float64 `json:"price" xorm:"PRICE"`                                           // 价格
+	SIZEDISPLAY                string  `json:"sizedisplay" xorm:"SIZEDISPLAY"`                               // 尺寸
 
 	WRTRADEORDERID        string    `json:"wrtradeorderid" xorm:"WRTRADEORDERID1" form:"wrtradeorderid"` // 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
 	TRADEDATE             string    `json:"tradedate" xorm:"TRADEDATE"`                                  // 交易日(yyyyMMdd)
@@ -1091,6 +1092,10 @@ func (r *MySellOrder) buildSql() string {
 		q.SIZE1                     ,
 		q.SIZE2                     ,
 		q.SIZE3                     ,
+		CASE WHEN
+			q.SIZE1 IS NOT NULL AND q.SIZE2 IS NOT NULL AND q.SIZE2 IS NOT NULL THEN q.SIZE1 || '*' || q.SIZE2 || '*' || q.SIZE3
+			ELSE q.SIZE1
+		END AS SIZEDISPLAY,
 		q.CERNO                     ,
 		q.ZSCRYSTALTYPE             ,
 		q.CPCERTNO                  ,
@@ -1206,6 +1211,10 @@ func (r *MySellOrder) buildSql_His() string {
 		q.SIZE1                     ,
 		q.SIZE2                     ,
 		q.SIZE3                     ,
+		CASE WHEN
+			q.SIZE1 IS NOT NULL AND q.SIZE2 IS NOT NULL AND q.SIZE2 IS NOT NULL THEN q.SIZE1 || '*' || q.SIZE2 || '*' || q.SIZE3
+			ELSE q.SIZE1
+		END AS SIZEDISPLAY,
 		q.CERNO                     ,
 		q.ZSCRYSTALTYPE             ,
 		q.CPCERTNO                  ,