|
|
@@ -80,7 +80,7 @@ func GetTouristGoods(tradeModes []int) (goods []TouristGoods, err error) {
|
|
|
|
|
|
// TradeHolderDetailEx 交易持仓扩展表
|
|
|
type TradeHolderDetailEx struct {
|
|
|
- TradeID uint64 `json:"tradeID"` // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
|
|
|
+ TradeID uint64 `json:"tradeID,string"` // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
|
|
|
BuyOrSell uint32 `json:"buyOrSell"` // 方向 - 0:买 1:卖
|
|
|
TradeDate string `json:"tradeDate"` // 交易日(yyyyMMdd)
|
|
|
MarketID uint32 `json:"marketID"` // 市场ID
|
|
|
@@ -149,7 +149,7 @@ func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int) (sData Red
|
|
|
sData = make([]RedisTradeHolderDetailEx, 0)
|
|
|
// boost::format fmtDuration("TradeHolderDetailEx:%d_%d_%d_%" PRId64 "");
|
|
|
// fmtDuration % detailEx.goodsid() % detailEx.buyorsell()%detailEx.userid()%detailEx.tradeid();
|
|
|
- key := fmt.Sprintf("TradeHolderDetailEx:%s:*:%d:*", g, userId)
|
|
|
+ key := fmt.Sprintf("TradeHolderDetailEx:%s_*_%d_*", g, userId)
|
|
|
if ret, err := redisCli.Do("keys", key).Result(); err == nil {
|
|
|
datas := ret.([]interface{})
|
|
|
for _, item := range datas {
|
|
|
@@ -192,10 +192,10 @@ func (r *RedisTradeHolderDetailEx) ParseFromProto(p *pb.RedisTradeHolderDetailEx
|
|
|
MatchUserID: p.GetTHDetailEx().GetMatchUserID(),
|
|
|
MatchAccountID: p.GetTHDetailEx().GetMatchAccountID(),
|
|
|
OpenQty: p.GetTHDetailEx().GetOpenQty(),
|
|
|
- TradeAmount: p.GetTHDetailEx().GetTradeAmount(),
|
|
|
- OpenPrice: p.GetTHDetailEx().GetOpenPrice(),
|
|
|
+ TradeAmount: utils.Float64Round(p.GetTHDetailEx().GetTradeAmount(), 2),
|
|
|
+ OpenPrice: utils.Float64Round(p.GetTHDetailEx().GetOpenPrice(), int(p.GetDecimalPlace())),
|
|
|
HolderQty: p.GetTHDetailEx().GetHolderQty(),
|
|
|
- HolderAmount: p.GetTHDetailEx().GetHolderAmount(),
|
|
|
+ HolderAmount: utils.Float64Round(p.GetTHDetailEx().GetHolderAmount(), 2),
|
|
|
HolderPrice: p.GetTHDetailEx().GetHolderPrice(),
|
|
|
FreezeQty: p.GetTHDetailEx().GetFreezeQty(),
|
|
|
DeliveryQty: p.GetTHDetailEx().GetDeliveryQty(),
|
|
|
@@ -208,8 +208,8 @@ func (r *RedisTradeHolderDetailEx) ParseFromProto(p *pb.RedisTradeHolderDetailEx
|
|
|
CallAteFee: p.GetTHDetailEx().GetCallAteFee(),
|
|
|
PromptDepositRate: p.GetTHDetailEx().GetPromptDepositRate(),
|
|
|
CutDepositRate: p.GetTHDetailEx().GetCutDepositRate(),
|
|
|
- PromptPrice: p.GetTHDetailEx().GetPromptPrice(),
|
|
|
- CutPrice: p.GetTHDetailEx().GetCutPrice(),
|
|
|
+ PromptPrice: utils.Float64Round(p.GetTHDetailEx().GetPromptPrice(), int(p.GetDecimalPlace())),
|
|
|
+ CutPrice: utils.Float64Round(p.GetTHDetailEx().GetCutPrice(), int(p.GetDecimalPlace())),
|
|
|
ClosePL: p.GetTHDetailEx().GetClosePL(),
|
|
|
FloatPL: p.GetTHDetailEx().GetFloatPL(),
|
|
|
DepositRate: p.GetTHDetailEx().GetDepositRate(),
|
|
|
@@ -384,7 +384,7 @@ type MyDeliveryofflineoperatelog struct {
|
|
|
OPERATORACCOUNT string `json:"operatoraccount" xorm:"OPERATORACCOUNT"` // 操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid
|
|
|
OPERATORNAME string `json:"operatorname" xorm:"OPERATORNAME"` // 操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid
|
|
|
REMARK string `json:"remark" xorm:"REMARK"` // 操作备注
|
|
|
- OPERATETIME time.Time `json:"operatetime" xorm:"OPERATETIME"` // 操作时间
|
|
|
+ OPERATETIME string `json:"operatetime" xorm:"OPERATETIME"` // 操作时间
|
|
|
FILENAME string `json:"filename" xorm:"FILENAME"` // 文件名称
|
|
|
FILEADDRESS string `json:"fileaddress" xorm:"FILEADDRESS"` // 文件地址
|
|
|
DELIVERYPAYMODE int32 `json:"deliverypaymode" xorm:"DELIVERYPAYMODE" form:"deliverypaymode"` // 付款方式 - 1:线上支付2:线下支付 - 枚举deliveryPayMode
|
|
|
@@ -413,7 +413,7 @@ func (r *MyDeliveryofflineoperatelog) buildSql() string {
|
|
|
t.operatoraccount,
|
|
|
t.operatorname,
|
|
|
t.remark,
|
|
|
- t.operatetime,
|
|
|
+ to_char(t.operatetime, 'yyyy-MM-dd hh24:mi:ss') OPERATETIME,
|
|
|
t.filename,
|
|
|
t.fileaddress,
|
|
|
t.deliverypaymode,
|
