Kaynağa Gözat

更新:敞口 - 期货变动明细, 取品种所有成交明细

gitmuchinfo 3 yıl önce
ebeveyn
işleme
f986ea5913
1 değiştirilmiş dosya ile 16 ekleme ve 16 silme
  1. 16 16
      models/ermcp8.go

+ 16 - 16
models/ermcp8.go

@@ -1881,7 +1881,7 @@ func (r *Ermcp2hedgeditemsDetail) GetDataEx() (interface{}, error) {
 	return sData, nil
 }
 
-// Patradelinkdetail 期货变动明细
+// Patradelinkdetail 敞口 - 期货变动明细
 type Patradelinkdetail struct {
 	LINKDETAILID   string  `json:"linkdetailid"  xorm:"LINKDETAILID"`                        // 期货明细ID(614+Unix秒时间戳(10位)+xxxxxx)
 	TRADEID        string  `json:"tradeid"  xorm:"TRADEID"`                                  // [成交单号]内部成交单ID
@@ -1926,23 +1926,23 @@ func (r *Patradelinkdetail) calc() {
 
 func (r *Patradelinkdetail) buildSql() string {
 	var sqlId utils.SQLVal = `
-	SELECT
-		to_char(t.CREATETIME, 'yyyy-mm-dd hh24:mi:ss') CREATETIME,
-		p.ORDERTYPE,
-		g.GOODSCODE,
-		t.BUYORSELL,
-		t.TRADEPRICE,
-		t.RELATEDLOT,
-		(t.RelatedLot * t.TradePrice * t.AgreeUnit) AMOUNT,
-		(t.RelatedLot * t.AgreeUnit * t.ConvertRatio) CONVERTRATIOCHANGE,
-		to_char(t.TRADEID) TRADEID,
-		u.ACCOUNTNAME
-	FROM ERMCP_PA_TradeLinkDetail t
-	INNER JOIN ERMCP_PA_TradeLink p ON p.TradeID = t.TradeID AND p.BuyorSell = t.BuyorSell
+	SELECT 
+	   to_char(p.tradetime, 'yyyy-mm-dd hh24:mi:ss') CREATETIME,
+       p.ORDERTYPE,
+       g.GOODSCODE,
+       p.BUYORSELL,
+       p.TRADEPRICE,
+       p.TRADELOT RELATEDLOT,
+       p.TRADEAMOUNT AMOUNT,
+       p.MIDDLEGOODSQTY CONVERTRATIOCHANGE,
+       to_char(p.TRADEID) TRADEID,
+       u.ACCOUNTNAME
+	FROM ERMCP_PA_TradeLink p
 	LEFT JOIN TAACCOUNT ta on ta.accountid = p.ACCOUNTID
   	LEFT JOIN USERACCOUNT u on u.userid = ta.relateduserid
-	LEFT JOIN GOODS g ON g.goodsid = t.goodsid
-	WHERE (t.relatedmode in (1,2) and t.linkstatus = 1) AND t.areauserid = %v AND t.middlegoodsid = %v
+	LEFT JOIN GOODS g ON g.goodsid = p.goodsid
+	WHERE p.areauserid = %v AND p.middlegoodsid = %v
+	ORDER BY p.TRADEID
 	`
 	sqlId.FormatParam(r.USERID, r.MIDDLEGOODSID)