|
|
@@ -992,6 +992,9 @@ type MineTradeGoodsDeliveryOffline struct {
|
|
|
|
|
|
CUSTOMERNAME string `json:"matchusername" xorm:"MATCHUSERNAME"` // [交收对手方]客户名称(企业名称)
|
|
|
AGREEUNIT float64 `json:"agreeunit" xorm:"AGREEUNIT"` // 合约乘数
|
|
|
+ GOODSNAMETH string `json:"goodsnameth" xorm:"GOODSNAMETH"` // 期货合约名称泰文)
|
|
|
+ GOODSNAMEEN string `json:"goodsnameen" xorm:"GOODSNAMEEN"` // 期货合约名称(英文)
|
|
|
+ GOODSNAMETW string `json:"goodsnametw" xorm:"GOODSNAMETW"` // 期货合约名称(繁体)
|
|
|
|
|
|
MarketIds string `form:"marketids"` // 过滤市场ID列表,格式 1,2,3
|
|
|
|
|
|
@@ -1035,13 +1038,19 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
|
|
|
to_char(t.tradeid) TRADEID,
|
|
|
t.totalpricemove,
|
|
|
t.totalshippingfee,
|
|
|
- t.totalotherfee
|
|
|
+ t.totalotherfee,
|
|
|
+ ge.goodsnameth,
|
|
|
+ ge.goodsnameen,
|
|
|
+ ge.goodsnametw
|
|
|
|
|
|
from Trade_GoodsDeliveryOffLine t
|
|
|
|
|
|
left join goods g
|
|
|
on t.goodsid = g.goodsid
|
|
|
|
|
|
+ left join goodsex ge
|
|
|
+ on t.goodsid = ge.goodsid
|
|
|
+
|
|
|
left join enumdicitem e1
|
|
|
on e1.enumdiccode = 'buyOrSell'
|
|
|
and t.buyorsell = e1.enumitemname
|