|
|
@@ -1221,3 +1221,57 @@ func GetHsbyMarketInfos() ([]HsbyMarketInfo, error) {
|
|
|
|
|
|
return markets, nil
|
|
|
}
|
|
|
+
|
|
|
+// HsbySellCollectionOrder 我的闲置中收款信息
|
|
|
+type HsbySellCollectionOrder struct {
|
|
|
+ Tradeid string `json:"tradeid" xorm:"'TRADEIDSTR'" binding:"required"` // 成交单号(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 string `json:"buyorderid" xorm:"'BUYORDERIDSTR'"` // 买方委托单号
|
|
|
+ Buyaccountid int64 `json:"buyaccountid" xorm:"'BUYACCOUNTID'"` // 买方账号ID[报价币种]
|
|
|
+ Sellorderid string `json:"sellorderid" xorm:"'SELLORDERIDSTR'"` // 卖方委托单号
|
|
|
+ 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 time.Time `json:"createtime" xorm:"'CREATETIME'"` // 创建时间
|
|
|
+ Paytime time.Time `json:"paytime" xorm:"'PAYTIME'"` // 付款时间
|
|
|
+ Paylimitedtime time.Time `json:"paylimitedtime" xorm:"'PAYLIMITEDTIME'"` // 支付期限
|
|
|
+ Offamount float64 `json:"offamount" xorm:"'OFFAMOUNT'"` // 优惠金额
|
|
|
+ Tradeprice float64 `json:"tradeprice" xorm:"'TRADEPRICE'"` // 成交价格
|
|
|
+ Tradeqty int64 `json:"tradeqty" xorm:"'TRADEQTY'"` // 成交数量
|
|
|
+ Payamount float64 `json:"payamount" xorm:"'PAYAMOUNT'"` // 支付金额 = TradeAmount + TradeCharge - OffAmount
|
|
|
+
|
|
|
+ Customername string `json:"customername" xorm:"'CUSTOMERNAME'"` // 客户名称(企业名称),已脱敏
|
|
|
+
|
|
|
+ Currencysign string `json:"currencysign" xorm:"CURRENCYSIGN"` // 货币符号
|
|
|
+ Goodunit string `json:"goodunit" xorm:"GOODUNIT"` // 报价单位
|
|
|
+
|
|
|
+ Agreeunit float64 `json:"agreeunit" xorm:"'AGREEUNIT'"` // 合约单位
|
|
|
+}
|
|
|
+
|
|
|
+// GetHsbySellCollectionOrders 获取我的闲置中收款信息
|
|
|
+func GetHsbySellCollectionOrders(sellOrderID, sellAccountID int) ([]HsbySellCollectionOrder, error) {
|
|
|
+ engine := db.GetEngine()
|
|
|
+
|
|
|
+ orders := make([]HsbySellCollectionOrder, 0)
|
|
|
+ if err := engine.Table("TRADE_PAYORDER TP").
|
|
|
+ Select(`to_char(TP.TRADEID) TRADEIDSTR, to_char(TP.BUYORDERID) BUYORDERIDSTR, to_char(TP.SELLORDERID) SELLORDERIDSTR, TP.*,
|
|
|
+ substr(U.CUSTOMERNAME,0,1)||'****' as CUSTOMERNAME,
|
|
|
+ E1.PARAM2 CURRENCYSIGN,
|
|
|
+ E1.ENUMDICNAME GOODUNIT,
|
|
|
+ G.AGREEUNIT`).
|
|
|
+ Join("LEFT", "TAACCOUNT TA", "TA.ACCOUNTID = TP.SELLACCOUNTID").
|
|
|
+ Join("LEFT", "USERINFO U", "U.USERID = TA.RELATEDUSERID").
|
|
|
+ Join("LEFT", "GOODS G", "G.GOODSID = TP.GOODSID").
|
|
|
+ Join("LEFT", "ENUMDICITEM E1", "E1.ENUMITEMNAME = G.CURRENCYID and E1.ENUMDICCODE = 'currency'").
|
|
|
+ Join("LEFT", "ENUMDICITEM E2", "E2.ENUMITEMNAME = G.GOODUNITID and E2.ENUMDICCODE = 'goodsunit'").
|
|
|
+ Where("TP.PAYFLAG in (1,2) and TP.SELLORDERID = ?", sellOrderID).
|
|
|
+ And("TP.SELLACCOUNTID = ?", sellAccountID).
|
|
|
+ Find(&orders); err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
+ return orders, nil
|
|
|
+}
|