增加查询待付款单据接口

controllers/qhj/qryQhj.go

@@ -345,3 +345,22 @@ func QueryAccountInOutApply(c *gin.Context) {
 	m := models.QhjAccountOutInApply{BeginDate: req.BEGINDATE, EndDate: req.ENDDATE, FilterName: req.LIKENAME}
 	a.DoGetDataI(&m)
 }
+
+// QueryPayOrder
+// @Summary 查询待付款单据
+// @Produce json
+// @Security ApiKeyAuth
+// @Param accountid query int true "资金账号id"
+// @Success 200 {array} models.QhjPayOrder
+// @Failure 500 {object} app.Response
+// @Router /Qhj/QueryPayOrder [get]
+// @Tags 大连千海金
+func QueryPayOrder(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	req := struct {
+		ACCOUNTID int64 `form:"accountid" binding:"required"` // 用户id
+	}{}
+	a.DoBindReq(&req)
+	m := models.QhjPayOrder{BUYACCOUNTID: req.ACCOUNTID}
+	a.DoGetDataI(&m)
+}

docs/docs.go

@@ -7156,6 +7156,48 @@ var doc = `{
                 }
             }
         },
+        "/Qhj/QueryPayOrder": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询待付款单据",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "资金账号id",
+                        "name": "accountid",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjPayOrder"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryPickArea": {
             "get": {
                 "security": [
@@ -14389,7 +14431,7 @@ var doc = `{
                     "type": "string"
                 },
                 "hedgeplanno": {
-                    "description": "套保计划编号",
+                    "description": "套保计划名称",
                     "type": "string"
                 },
                 "hedgeplanstatus": {
@@ -21655,6 +21697,95 @@ var doc = `{
                 }
             }
         },
+        "models.QhjPayOrder": {
+            "type": "object",
+            "properties": {
+                "buyaccountid": {
+                    "description": "买方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "buyorderid": {
+                    "description": "买方委托单号",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "goodscode": {
+                    "description": "商品代码",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "offamount": {
+                    "description": "优惠金额",
+                    "type": "number"
+                },
+                "operatetype": {
+                    "description": "买委托操作类型 - 1:正常下单 16:融资买入",
+                    "type": "integer"
+                },
+                "payamount": {
+                    "description": "支付金额=TradeAmount + TradeCharge",
+                    "type": "number"
+                },
+                "payflag": {
+                    "description": "付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止",
+                    "type": "integer"
+                },
+                "paylimitedtime": {
+                    "description": "支付期限",
+                    "type": "string"
+                },
+                "paytime": {
+                    "description": "付款时间",
+                    "type": "string"
+                },
+                "sellaccountid": {
+                    "description": "卖方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "sellorderid": {
+                    "description": "卖方委托单号",
+                    "type": "integer"
+                },
+                "tradeamount": {
+                    "description": "成交金额(优惠后金额)",
+                    "type": "number"
+                },
+                "tradecharge": {
+                    "description": "成交手续费(买方)",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "integer"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeqty": {
+                    "description": "成交数量",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjPickArea": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -7140,6 +7140,48 @@
                 }
             }
         },
+        "/Qhj/QueryPayOrder": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询待付款单据",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "资金账号id",
+                        "name": "accountid",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjPayOrder"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryPickArea": {
             "get": {
                 "security": [
@@ -14373,7 +14415,7 @@
                     "type": "string"
                 },
                 "hedgeplanno": {
-                    "description": "套保计划编号",
+                    "description": "套保计划名称",
                     "type": "string"
                 },
                 "hedgeplanstatus": {
@@ -21639,6 +21681,95 @@
                 }
             }
         },
+        "models.QhjPayOrder": {
+            "type": "object",
+            "properties": {
+                "buyaccountid": {
+                    "description": "买方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "buyorderid": {
+                    "description": "买方委托单号",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "goodscode": {
+                    "description": "商品代码",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "offamount": {
+                    "description": "优惠金额",
+                    "type": "number"
+                },
+                "operatetype": {
+                    "description": "买委托操作类型 - 1:正常下单 16:融资买入",
+                    "type": "integer"
+                },
+                "payamount": {
+                    "description": "支付金额=TradeAmount + TradeCharge",
+                    "type": "number"
+                },
+                "payflag": {
+                    "description": "付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止",
+                    "type": "integer"
+                },
+                "paylimitedtime": {
+                    "description": "支付期限",
+                    "type": "string"
+                },
+                "paytime": {
+                    "description": "付款时间",
+                    "type": "string"
+                },
+                "sellaccountid": {
+                    "description": "卖方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "sellorderid": {
+                    "description": "卖方委托单号",
+                    "type": "integer"
+                },
+                "tradeamount": {
+                    "description": "成交金额(优惠后金额)",
+                    "type": "number"
+                },
+                "tradecharge": {
+                    "description": "成交手续费(买方)",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "integer"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeqty": {
+                    "description": "成交数量",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjPickArea": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -4102,7 +4102,7 @@ definitions:
         description: 套保计划id
         type: string
       hedgeplanno:
-        description: 套保计划编号
+        description: 套保计划名称
         type: string
       hedgeplanstatus:
         description: 套保计划状态 -  0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
@@ -9530,6 +9530,72 @@ definitions:
         description: 用户名称
         type: string
     type: object
+  models.QhjPayOrder:
+    properties:
+      buyaccountid:
+        description: 买方账号ID[报价币种]
+        type: integer
+      buyorderid:
+        description: 买方委托单号
+        type: integer
+      createtime:
+        description: 创建时间
+        type: string
+      goodscode:
+        description: 商品代码
+        type: string
+      goodsid:
+        description: 商品ID
+        type: integer
+      goodsname:
+        description: 商品名称
+        type: string
+      marketid:
+        description: 市场ID
+        type: integer
+      offamount:
+        description: 优惠金额
+        type: number
+      operatetype:
+        description: 买委托操作类型 - 1:正常下单 16:融资买入
+        type: integer
+      payamount:
+        description: 支付金额=TradeAmount + TradeCharge
+        type: number
+      payflag:
+        description: 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+        type: integer
+      paylimitedtime:
+        description: 支付期限
+        type: string
+      paytime:
+        description: 付款时间
+        type: string
+      sellaccountid:
+        description: 卖方账号ID[报价币种]
+        type: integer
+      sellorderid:
+        description: 卖方委托单号
+        type: integer
+      tradeamount:
+        description: 成交金额(优惠后金额)
+        type: number
+      tradecharge:
+        description: 成交手续费(买方)
+        type: number
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      tradeid:
+        description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: integer
+      tradeprice:
+        description: 成交价格
+        type: number
+      tradeqty:
+        description: 成交数量
+        type: integer
+    type: object
   models.QhjPickArea:
     properties:
       cityid:
@@ -17525,6 +17591,32 @@ paths:
       summary: 查询客户资料
       tags:
       - 大连千海金
+  /Qhj/QueryPayOrder:
+    get:
+      parameters:
+      - description: 资金账号id
+        in: query
+        name: accountid
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.QhjPayOrder'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询待付款单据
+      tags:
+      - 大连千海金
   /Qhj/QueryPickArea:
     get:
       parameters:

models/qhj.go

@@ -1369,3 +1369,71 @@ func (r *QhjAccountOutInApply) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// QhjPayOrder 待付款单据
+type QhjPayOrder struct {
+	OPERATETYPE    int32   `json:"operatetype"  xorm:"OPERATETYPE"`       // 买委托操作类型 - 1:正常下单 16:融资买入
+	TRADEID        int64   `json:"tradeid"  xorm:"TRADEID"`               // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	TRADEDATE      string  `json:"tradedate"  xorm:"TRADEDATE"`           // 交易日(yyyyMMdd)
+	MARKETID       int32   `json:"marketid"  xorm:"MARKETID"`             // 市场ID
+	GOODSID        int32   `json:"goodsid"  xorm:"GOODSID"`               // 商品ID
+	BUYORDERID     int64   `json:"buyorderid"  xorm:"BUYORDERID"`         // 买方委托单号
+	BUYACCOUNTID   int64   `json:"buyaccountid"  xorm:"BUYACCOUNTID"`     // 买方账号ID[报价币种]
+	SELLORDERID    int64   `json:"sellorderid"  xorm:"SELLORDERID"`       // 卖方委托单号
+	SELLACCOUNTID  int64   `json:"sellaccountid"  xorm:"SELLACCOUNTID"`   // 卖方账号ID[报价币种]
+	TRADEAMOUNT    float64 `json:"tradeamount"  xorm:"TRADEAMOUNT"`       // 成交金额(优惠后金额)
+	TRADECHARGE    float64 `json:"tradecharge"  xorm:"TRADECHARGE"`       // 成交手续费(买方)
+	PAYFLAG        int32   `json:"payflag"  xorm:"PAYFLAG"`               // 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+	CREATETIME     string  `json:"createtime"  xorm:"CREATETIME"`         // 创建时间
+	PAYTIME        string  `json:"paytime"  xorm:"PAYTIME"`               // 付款时间
+	PAYLIMITEDTIME string  `json:"paylimitedtime"  xorm:"PAYLIMITEDTIME"` // 支付期限
+	OFFAMOUNT      float64 `json:"offamount"  xorm:"OFFAMOUNT"`           // 优惠金额
+	TRADEPRICE     float64 `json:"tradeprice"  xorm:"TRADEPRICE"`         // 成交价格
+	TRADEQTY       int32   `json:"tradeqty"  xorm:"TRADEQTY"`             // 成交数量
+	PAYAMOUNT      float64 `json:"payamount"  xorm:"PAYAMOUNT"`           // 支付金额=TradeAmount + TradeCharge
+	GOODSCODE      string  `json:"goodscode"  xorm:"'GOODSCODE'"`         // 商品代码
+	GOODSNAME      string  `json:"goodsname"  xorm:"'GOODSNAME'"`         // 商品名称
+}
+
+func (r *QhjPayOrder) calc() {
+
+}
+
+func (r *QhjPayOrder) buildSql() string {
+	var sqlId utils.SQLVal = "SELECT t.OPERATETYPE," +
+		"       t.TRADEID," +
+		"       t.TRADEDATE," +
+		"       t.MARKETID," +
+		"       t.GOODSID," +
+		"       t.BUYORDERID," +
+		"       t.BUYACCOUNTID," +
+		"       t.SELLORDERID," +
+		"       t.SELLACCOUNTID," +
+		"       t.TRADEAMOUNT," +
+		"       t.TRADECHARGE," +
+		"       t.PAYFLAG," +
+		"       to_char(t.CREATETIME, 'yyyy-mm-dd hh24:mi:ss') CREATETIME," +
+		"       to_char(t.PAYTIME, 'yyyy-mm-dd hh24:mi:ss') PAYTIME," +
+		"       to_char(t.PAYLIMITEDTIME, 'yyyy-mm-dd hh24:mi:ss') PAYLIMITEDTIME," +
+		"       t.OFFAMOUNT," +
+		"       t.TRADEPRICE," +
+		"       t.TRADEQTY," +
+		"       t.PAYAMOUNT," +
+		"       g.goodscode," +
+		"       g.goodsname" +
+		"  FROM TRADE_PAYORDER t" +
+		"  LEFT JOIN GOODS g on t.goodsid=g.goodsid" +
+		" WHERE 1 = 1"
+	sqlId.AndEx("t.BUYACCOUNTID", r.BUYACCOUNTID, r.BUYACCOUNTID > 0)
+	return sqlId.String()
+}
+
+// GetDataEx 获取待付款单据
+func (r *QhjPayOrder) GetDataEx() (interface{}, error) {
+	sData := make([]QhjPayOrder, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -465,6 +465,7 @@ func InitRouter() *gin.Engine {
 		qhjR.GET("QueryCusBankSignBank", qhj.QueryCusBankSignBank)
 		qhjR.GET("QuerySiteColumnDetail", qhj.QuerySiteColumnDetail)
 		qhjR.GET("QueryAccountInOutApply", qhj.QueryAccountInOutApply)
+		qhjR.GET("QueryPayOrder", qhj.QueryPayOrder)
 	}
 
 	return r