Browse Source

QueryMineCpTradePreSaleResults:修改失真字段

deng.yinping 2 years ago
parent
commit
ca97eb1387
4 changed files with 10 additions and 10 deletions
  1. 2 2
      docs/docs.go
  2. 2 2
      docs/swagger.json
  3. 2 2
      docs/swagger.yaml
  4. 4 4
      models/mine.go

+ 2 - 2
docs/docs.go

@@ -39655,7 +39655,7 @@ const docTemplate = `{
             "properties": {
                 "applyid": {
                     "description": "预售申请ID",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "buyaccountid": {
                     "description": "买方账户ID",
@@ -39759,7 +39759,7 @@ const docTemplate = `{
                 },
                 "tradeid": {
                     "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "tradeqty": {
                     "description": "成交数量",

+ 2 - 2
docs/swagger.json

@@ -39646,7 +39646,7 @@
             "properties": {
                 "applyid": {
                     "description": "预售申请ID",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "buyaccountid": {
                     "description": "买方账户ID",
@@ -39750,7 +39750,7 @@
                 },
                 "tradeid": {
                     "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "tradeqty": {
                     "description": "成交数量",

+ 2 - 2
docs/swagger.yaml

@@ -13782,7 +13782,7 @@ definitions:
     properties:
       applyid:
         description: 预售申请ID
-        type: integer
+        type: string
       buyaccountid:
         description: 买方账户ID
         type: integer
@@ -13860,7 +13860,7 @@ definitions:
         type: string
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
+        type: string
       tradeqty:
         description: 成交数量
         type: integer

+ 4 - 4
models/mine.go

@@ -8,7 +8,7 @@ import (
 
 // MineCpTradePreSaleResult 我的持仓-预售持仓
 type MineCpTradePreSaleResult struct {
-	TRADEID         int64     `json:"tradeid" xorm:"TRADEID"`                                      // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	TRADEID         string    `json:"tradeid" xorm:"TRADEID"`                                      // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	GOODSID         int64     `json:"goodsid" xorm:"GOODSID"`                                      // 商品ID
 	BUYACCOUNTID    int64     `json:"buyaccountid" xorm:"BUYACCOUNTID"`                            // 买方账户ID
 	BUYUSERID       int64     `json:"buyuserid" xorm:"BUYUSERID" form:"userid" binding:"required"` // 买方用户ID
@@ -22,7 +22,7 @@ type MineCpTradePreSaleResult struct {
 	TRADEDATE       string    `json:"tradedate" xorm:"TRADEDATE"`                                  // 交易日(yyyyMMdd)
 	MARKETID        int32     `json:"marketid" xorm:"MARKETID"`                                    // 市场ID
 	RELATEDMARKETID int64     `json:"relatedmarketid" xorm:"RELATEDMARKETID"`                      // 关联交易合约市场ID
-	APPLYID         int64     `json:"applyid" xorm:"APPLYID"`                                      // 预售申请ID
+	APPLYID         string    `json:"applyid" xorm:"APPLYID"`                                      // 预售申请ID
 	OPENPRICE       float64   `json:"openprice" xorm:"OPENPRICE"`                                  // 建仓价格\预售价
 	TRADEAMOUNT     float64   `json:"tradeamount" xorm:"TRADEAMOUNT"`                              // 成交金额\转让定金
 	SELLHANDLEFLAG  int32     `json:"sellhandleflag" xorm:"SELLHANDLEFLAG"`                        // 卖处理标识
@@ -59,7 +59,7 @@ func (r *MineCpTradePreSaleResult) buildSql() string {
 		to_char(pge.starttime, 'yyyy-mm-dd') STARTTIME,
 		to_char(pge.endtime, 'yyyy-mm-dd') ENDTIME,
 		g.transferdepositratio,
-		t.tradeid,
+		to_char(t.tradeid) TRADEID,
 		t.goodsid,
 		t.buyaccountid,
 		t.buyuserid,
@@ -73,7 +73,7 @@ func (r *MineCpTradePreSaleResult) buildSql() string {
 		t.tradedate,
 		t.marketid,
 		t.relatedmarketid,
-		t.applyid,
+		to_char(t.applyid) APPLYID,
 		t.openprice,
 		t.tradeamount,
 		t.sellhandleflag,