|
|
@@ -1337,7 +1337,7 @@ type MyDeListing struct {
|
|
|
TRADEPRICE float64 `json:"tradeprice" xorm:"TRADEPRICE"` // 成交价格
|
|
|
TRADEQTY int64 `json:"-" xorm:"TRADEQTY"` // 成交数量
|
|
|
TRADEAMOUNT float64 `json:"tradeamount" xorm:"TRADEAMOUNT"` // 成交金额
|
|
|
- PERFORMANCEPLANID int64 `json:"performanceplanid" xorm:"PERFORMANCEPLANID"` // 履约计划ID/合同ID
|
|
|
+ PERFORMANCEPLANID string `json:"performanceplanid" xorm:"PERFORMANCEPLANID1"` // 履约计划ID/合同ID
|
|
|
EXCHANGERATE float64 `json:"exchangerate" xorm:"EXCHANGERATE"` // 汇率
|
|
|
BUYCHARGEVALUE float64 `json:"buychargevalue" xorm:"BUYCHARGEVALUE"` // 买方手续费
|
|
|
SELLCHARGEVALUE float64 `json:"sellchargevalue" xorm:"SELLCHARGEVALUE"` // 卖方手续费
|
|
|
@@ -1404,7 +1404,23 @@ func (r *MyDeListing) buildSql() string {
|
|
|
(t.TRADEQTY / 100) QTY,
|
|
|
to_char(t.TRADETIME, 'yyyy-mm-dd hh24:mi:ss') TRADETIME1,
|
|
|
to_char(t.WRTRADEDETAILID) WRTRADEDETAILID1,
|
|
|
- t.*
|
|
|
+ t.TRADEDATE ,
|
|
|
+ t.MARKETID ,
|
|
|
+ t.WRFACTORTYPEID ,
|
|
|
+ t.DELIVERYGOODSID ,
|
|
|
+ t.WRSTANDARDID ,
|
|
|
+ t.BUYUSERID ,
|
|
|
+ t.BUYACCOUNTID ,
|
|
|
+ t.SELLUSERID ,
|
|
|
+ t.SELLACCOUNTID ,
|
|
|
+ t.TRADEPRICE ,
|
|
|
+ t.TRADEQTY ,
|
|
|
+ t.TRADEAMOUNT ,
|
|
|
+ to_char(t.PERFORMANCEPLANID) PERFORMANCEPLANID1,
|
|
|
+ t.EXCHANGERATE ,
|
|
|
+ t.BUYCHARGEVALUE ,
|
|
|
+ t.SELLCHARGEVALUE ,
|
|
|
+ t.ORITRADEAMOUNT
|
|
|
FROM WRTrade_TradeQuote t
|
|
|
INNER JOIN View_GZ_WRStandard_Ex_Query q ON t.wrstandardid = q.wrstandardid
|
|
|
LEFT JOIN UserAccount ua1 ON t.BuyUserID = ua1.userid
|
