Commit 5acc09bd authored by linj's avatar linj Committed by vipwzw

price: update sell market exec

parent f265dde9
...@@ -237,6 +237,8 @@ func (buydb *buyDB) getSellLogs(sellerAddr string, sellID string, boardlotCnt in ...@@ -237,6 +237,8 @@ func (buydb *buyDB) getSellLogs(sellerAddr string, sellID string, boardlotCnt in
TxHash: txhash, TxHash: txhash,
Height: buydb.Height, Height: buydb.Height,
AssetExec: buydb.AssetExec, AssetExec: buydb.AssetExec,
PriceExec: buydb.PriceExec,
PriceSymbol: buydb.PriceSymbol,
} }
receiptSellMarket := &pty.ReceiptSellMarket{Base: base} receiptSellMarket := &pty.ReceiptSellMarket{Base: base}
log.Log = types.Encode(receiptSellMarket) log.Log = types.Encode(receiptSellMarket)
...@@ -567,9 +569,13 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (* ...@@ -567,9 +569,13 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
} }
//首先购买费用的划转 //首先购买费用的划转
priceAcc, err := createPriceDB(action.height, action.db, buyOrder.PriceExec, buyOrder.PriceSymbol)
if err != nil {
return nil, err
}
amount := sellOrder.BoardlotCnt * buyOrder.PricePerBoardlot amount := sellOrder.BoardlotCnt * buyOrder.PricePerBoardlot
tradelog.Debug("tradeSellMarket", "step2 cnt", sellOrder.BoardlotCnt, "price", buyOrder.PricePerBoardlot, "amount", amount) tradelog.Debug("tradeSellMarket", "step2 cnt", sellOrder.BoardlotCnt, "price", buyOrder.PricePerBoardlot, "amount", amount)
receiptFromAcc, err := action.coinsAccount.ExecTransferFrozen(buyOrder.Address, action.fromaddr, action.execaddr, amount) receiptFromAcc, err := priceAcc.ExecTransferFrozen(buyOrder.Address, action.fromaddr, action.execaddr, amount)
if err != nil { if err != nil {
tradelog.Error("account.Transfer ", "addrFrom", buyOrder.Address, "addrTo", action.fromaddr, tradelog.Error("account.Transfer ", "addrFrom", buyOrder.Address, "addrTo", action.fromaddr,
"amount", amount) "amount", amount)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment