|
|
@@ -114,15 +114,18 @@ type QueryAmountLogReq struct {
|
|
|
type QueryAmountLogRsp struct {
|
|
|
models.Taaccountlog `xorm:"extends"`
|
|
|
|
|
|
- MarketName string `json:"marketname" xorm:"'MARKETNAME'"` // 市场名称
|
|
|
- TradeMode uint32 `json:"trademode" xorm:"'TRADEMODE'"` // 交易模式
|
|
|
- GoodsCode string `json:"goodscode" xorm:"'GOODSCODE'"` // 商品代码
|
|
|
- GoodsName string `json:"goodsname" xorm:"'GOODSNAME'"` // 商品名称
|
|
|
- AGoodsCode string `json:"agoodscode" xorm:"'AGOODSCODE'"` // 竞拍商品代码
|
|
|
- AGoodsName string `json:"agoodsname" xorm:"'GOODSNAME'"` // 竞拍商品名称
|
|
|
- DGoodsCode string `json:"dgoodscode" xorm:"'DGOODSCODE'"` // 交割商品代码
|
|
|
- DGoodsName string `json:"dgoodsname" xorm:"'DGOODSNAME'"` // 交割商品名称
|
|
|
- OperateTypeName string `json:"operatetypename" xorm:"OPERATETYPENAME"` // 资金操作类型名称(显示)
|
|
|
+ MarketName string `json:"marketname" xorm:"'MARKETNAME'"` // 市场名称
|
|
|
+ TradeMode uint32 `json:"trademode" xorm:"'TRADEMODE'"` // 交易模式
|
|
|
+ GoodsCode string `json:"goodscode" xorm:"'GOODSCODE'"` // 商品代码
|
|
|
+ GoodsName string `json:"goodsname" xorm:"'GOODSNAME'"` // 商品名称
|
|
|
+ AGoodsCode string `json:"agoodscode" xorm:"'AGOODSCODE'"` // 竞拍商品代码
|
|
|
+ AGoodsName string `json:"agoodsname" xorm:"'GOODSNAME'"` // 竞拍商品名称
|
|
|
+ DGoodsCode string `json:"dgoodscode" xorm:"'DGOODSCODE'"` // 交割商品代码
|
|
|
+ DGoodsName string `json:"dgoodsname" xorm:"'DGOODSNAME'"` // 交割商品名称
|
|
|
+ OperateTypeName string `json:"operatetypename" xorm:"OPERATETYPENAME"` // 资金操作类型名称(显示)
|
|
|
+ OPERATETYPENAMEEN string `json:"operatetypenameen" xorm:"'OPERATETYPENAMEEN'"` // 枚举项名称 - 英文
|
|
|
+ OPERATETYPENAME_TW string `json:"operatetypename_tw" xorm:"'OPERATETYPENAME_TW'"` // 枚举项名称 - 繁体
|
|
|
+ OPERATETYPENAMETH string `json:"operatetypenameth" xorm:"'OPERATETYPENAMETH'"` // 枚举项名称 - 泰文
|
|
|
}
|
|
|
|
|
|
// QueryAmountLog 资金流水查询（当前）
|
|
|
@@ -157,7 +160,9 @@ func QueryAmountLog(c *gin.Context) {
|
|
|
// OPERATETYPENAME 显示时，旧的号段用operateType, 新的使用accountBusinessCode
|
|
|
s := engine.Table("TAACCOUNTLOG").
|
|
|
Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICCODE = 'accountBusinessCode' and ENUMDICITEM.ENUMITEMNAME = TAACCOUNTLOG.BUSINESSCODE").
|
|
|
+ Join("LEFT", "ENUMDICITEMEX", "ENUMDICITEM.ENUMDICCODE = ENUMDICITEMEX.ENUMDICCODE AND ENUMDICITEM.ENUMITEMNAME = ENUMDICITEMEX.ENUMITEMNAME").
|
|
|
Join("LEFT", "ENUMDICITEM E", "E.ENUMDICCODE = 'operateType' and E.ENUMITEMNAME = TAACCOUNTLOG.OPERATETYPE").
|
|
|
+ Join("LEFT", "ENUMDICITEMEX EX", "E.ENUMDICCODE = EX.ENUMDICCODE AND E.ENUMITEMNAME = EX.ENUMITEMNAME").
|
|
|
Join("LEFT", "MARKET", "MARKET.MARKETID = TAACCOUNTLOG.MARKETID").
|
|
|
Join("LEFT", "GOODS", "GOODS.GOODSID = TAACCOUNTLOG.GOODSID").
|
|
|
Join("LEFT", "AUCTION_ORDERINFO", "AUCTION_ORDERINFO.GOODSID = TAACCOUNTLOG.GOODSID").
|
|
|
@@ -172,7 +177,61 @@ func QueryAmountLog(c *gin.Context) {
|
|
|
THEN DECODE(TAACCOUNTLOG.BUSINESSCODE, NULL, '--', 0, '系统', ENUMDICITEM.ENUMDICNAME)
|
|
|
ELSE
|
|
|
DECODE(TAACCOUNTLOG.OPERATETYPE, NULL, '--', 0, '系统', E.ENUMDICNAME)
|
|
|
- END AS OPERATETYPENAME`).
|
|
|
+ END AS OPERATETYPENAME,
|
|
|
+ CASE
|
|
|
+ WHEN (TAACCOUNTLOG.BUSINESSCODE > 700 AND
|
|
|
+ TAACCOUNTLOG.BUSINESSCODE < 800) OR
|
|
|
+ (TAACCOUNTLOG.BUSINESSCODE > 1900) THEN
|
|
|
+ DECODE(TAACCOUNTLOG.BUSINESSCODE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ ENUMDICITEMEX.ENUMDICNAMEEN)
|
|
|
+ ELSE
|
|
|
+ DECODE(TAACCOUNTLOG.OPERATETYPE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ EX.ENUMDICNAMEEN)
|
|
|
+ END AS OPERATETYPENAMEEN,
|
|
|
+ CASE
|
|
|
+ WHEN (TAACCOUNTLOG.BUSINESSCODE > 700 AND
|
|
|
+ TAACCOUNTLOG.BUSINESSCODE < 800) OR
|
|
|
+ (TAACCOUNTLOG.BUSINESSCODE > 1900) THEN
|
|
|
+ DECODE(TAACCOUNTLOG.BUSINESSCODE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ ENUMDICITEMEX.ENUMDICNAMEZH_TW)
|
|
|
+ ELSE
|
|
|
+ DECODE(TAACCOUNTLOG.OPERATETYPE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ EX.ENUMDICNAMEZH_TW)
|
|
|
+ END AS OPERATETYPENAME_TW,
|
|
|
+ CASE
|
|
|
+ WHEN (TAACCOUNTLOG.BUSINESSCODE > 700 AND
|
|
|
+ TAACCOUNTLOG.BUSINESSCODE < 800) OR
|
|
|
+ (TAACCOUNTLOG.BUSINESSCODE > 1900) THEN
|
|
|
+ DECODE(TAACCOUNTLOG.BUSINESSCODE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ ENUMDICITEMEX.ENUMDICNAMETH)
|
|
|
+ ELSE
|
|
|
+ DECODE(TAACCOUNTLOG.OPERATETYPE,
|
|
|
+ NULL,
|
|
|
+ '--',
|
|
|
+ 0,
|
|
|
+ 'System',
|
|
|
+ EX.ENUMDICNAMETH)
|
|
|
+ END AS OPERATETYPENAMETH`).
|
|
|
// Where(fmt.Sprintf("TAACCOUNTLOG.AMOUNT <> 0 and TAACCOUNTLOG.ACCOUNTID in (%s)", req.AccountID)).
|
|
|
Where("TAACCOUNTLOG.AMOUNT <> 0").
|
|
|
In("TAACCOUNTLOG.ACCOUNTID", accountIDs).
|
zhouxnsz