|
|
@ -737,9 +737,11 @@ class OrderService extends AdminBaseService |
|
|
|
foreach ($list as $item) { |
|
|
|
// 计算浮动盈亏 |
|
|
|
if ($item['trade_type'] == 1) { |
|
|
|
$float = $item['closing_price'] - $item['deal_price']; |
|
|
|
// $float = $item['closing_price'] - $item['deal_price']; |
|
|
|
$float = bcsub($item['closing_price'], $item['deal_price'], 10); |
|
|
|
} else { |
|
|
|
$float = $item['deal_price'] - $item['closing_price']; |
|
|
|
// $float = $item['deal_price'] - $item['closing_price']; |
|
|
|
$float = bcsub($item['deal_price'], $item['closing_price'], 10); |
|
|
|
} |
|
|
|
|
|
|
|
// * 仓位 |
|
|
@ -1150,15 +1152,15 @@ class OrderService extends AdminBaseService |
|
|
|
foreach ($list as $item) { |
|
|
|
// 计算浮动盈亏 |
|
|
|
if ($item['trade_type'] == 1) { |
|
|
|
$float = $item['closing_price'] - $item['deal_price']; |
|
|
|
$float = bcsub($item['closing_price'], $item['deal_price'], 10); |
|
|
|
} else { |
|
|
|
$float = $item['deal_price'] - $item['closing_price']; |
|
|
|
$float = bcsub($item['deal_price'], $item['closing_price'], 10);; |
|
|
|
} |
|
|
|
|
|
|
|
// * 仓位 |
|
|
|
$float = @bcmul($float, $item['order_number'], 10); |
|
|
|
$float = bcmul($float, $item['order_number'], 10); |
|
|
|
// * 面值 |
|
|
|
$float = @bcmul($float, $item['face_value'], 6); |
|
|
|
$float = bcmul($float, $item['face_value'], 6); |
|
|
|
|
|
|
|
$rows[] = [ |
|
|
|
'trade_id' => $item['trade_id'], // |
|
|
@ -1563,9 +1565,11 @@ class OrderService extends AdminBaseService |
|
|
|
foreach ($list as $item) { |
|
|
|
// 计算浮动盈亏 |
|
|
|
if ($item['trade_type'] == 1) { |
|
|
|
$float = $item['closing_price'] - $item['deal_price']; |
|
|
|
// $float = $item['closing_price'] - $item['deal_price']; |
|
|
|
$float = bcsub($item['closing_price'], $item['deal_price'], 10); |
|
|
|
} else { |
|
|
|
$float = $item['deal_price'] - $item['closing_price']; |
|
|
|
// $float = $item['deal_price'] - $item['closing_price']; |
|
|
|
$float = bcsub($item['deal_price'], $item['closing_price'], 10); |
|
|
|
} |
|
|
|
|
|
|
|
// * 仓位 |
|
|
@ -1687,6 +1691,11 @@ class OrderService extends AdminBaseService |
|
|
|
$orderNumber = number_format($item['order_number'], '18', '.', ''); |
|
|
|
$orderPrice = number_format($item['deal_price'], '18', '.', ''); |
|
|
|
$orderAmount = bcmul($orderNumber, $orderPrice, 18); |
|
|
|
if (in_array($market_type, [21])) { // 一些市场类型字段不一样,比如黄金期货没有stock_id,而是用的contract_id |
|
|
|
$stockIdOrContractId = $item['contract_id']; |
|
|
|
} else { |
|
|
|
$stockIdOrContractId = $item['stock_id']; |
|
|
|
} |
|
|
|
$rows[] = [ |
|
|
|
'trade_id' => $item['trade_id'], // |
|
|
|
'user_no' => $userNoArr[$item['user_id']] ?? '-', // 用户号 |
|
|
@ -1694,7 +1703,7 @@ class OrderService extends AdminBaseService |
|
|
|
'open_time' => $item['open_time'] ?? '-', // 挂单时间 |
|
|
|
'trade_type' => $item['trade_type'] == 1 ? '买涨' : '买跌', |
|
|
|
'order_money' => $orderAmount, // 订单金额 |
|
|
|
'stock_id' => $item['stock_id'], // 股票代码 |
|
|
|
'stock_id' => $stockIdOrContractId, // 股票代码 |
|
|
|
'order_number' => $item['order_number'], // 数量 |
|
|
|
'service_cost' => $item['service_cost'], // 服务费 |
|
|
|
'float' => '-', // 浮动盈亏 |
|
|
@ -1798,6 +1807,11 @@ class OrderService extends AdminBaseService |
|
|
|
$orderNumber = number_format($item['order_number'], '18', '.', ''); |
|
|
|
$orderPrice = number_format($price, '18', '.', ''); |
|
|
|
$orderAmount = bcmul($orderNumber, $orderPrice, 18); |
|
|
|
if (in_array($market_type, [21])) { // 一些市场类型字段不一样,比如黄金期货没有stock_id,而是用的contract_id |
|
|
|
$stockIdOrContractId = $item['contract_id']; |
|
|
|
} else { |
|
|
|
$stockIdOrContractId = $item['stock_id']; |
|
|
|
} |
|
|
|
$rows[] = [ |
|
|
|
'trade_id' => $item['trade_id'], // |
|
|
|
'order_id' => $item['order_id'], // 订单号 |
|
|
@ -1805,7 +1819,7 @@ class OrderService extends AdminBaseService |
|
|
|
'create_time' => $item['create_time'], // 挂单时间 |
|
|
|
'order_money' => $orderAmount, // 订单金额 |
|
|
|
'trade_type' => $item['trade_type'] == 1 ? '买涨' : '买跌', |
|
|
|
'stock_id' => $item['stock_id'], // 合约代码 |
|
|
|
'stock_id' => $stockIdOrContractId, // 合约代码 |
|
|
|
'order_number' => $item['order_number'], // 数量 |
|
|
|
'service_cost' => $item['service_cost'], // 服务费 |
|
|
|
'deal_price' => $price, // 委托价 |
|
|
@ -1906,6 +1920,11 @@ class OrderService extends AdminBaseService |
|
|
|
$orderNumber = number_format($item['order_number'], '18', '.', ''); |
|
|
|
$orderPrice = number_format($price, '18', '.', ''); |
|
|
|
$orderAmount = bcmul($orderNumber, $orderPrice, 18); |
|
|
|
if (in_array($market_type, [21])) { // 一些市场类型字段不一样,比如黄金期货没有stock_id,而是用的contract_id |
|
|
|
$stockIdOrContractId = $item['contract_id']; |
|
|
|
} else { |
|
|
|
$stockIdOrContractId = $item['stock_id']; |
|
|
|
} |
|
|
|
$rows[] = [ |
|
|
|
'trade_id' => $item['trade_id'], // |
|
|
|
'user_no' => $userNoArr[$item['user_id']] ?? '-', // 用户号 |
|
|
@ -1914,7 +1933,7 @@ class OrderService extends AdminBaseService |
|
|
|
'update_time' => $item['update_time'], // 挂单时间 |
|
|
|
'trade_type' => $item['trade_type'] == 1 ? '买涨' : '买跌', |
|
|
|
'order_money' => $orderAmount, // 订单金额 |
|
|
|
'stock_id' => $item['stock_id'], // 合约代码 |
|
|
|
'stock_id' => $stockIdOrContractId, // 合约代码 |
|
|
|
'order_number' => $item['order_number'], // 数量 |
|
|
|
'service_cost' => $item['service_cost'], // 服务费 |
|
|
|
'deal_price' => $price, // 委托价 |
|
|
@ -2016,9 +2035,11 @@ class OrderService extends AdminBaseService |
|
|
|
foreach ($list as $item) { |
|
|
|
// 计算浮动盈亏 |
|
|
|
if ($item['trade_type'] == 1) { |
|
|
|
$float = $item['closing_price'] - $item['deal_price']; |
|
|
|
// $float = $item['closing_price'] - $item['deal_price']; |
|
|
|
$float = bcsub($item['closing_price'], $item['deal_price'], 18); |
|
|
|
} else { |
|
|
|
$float = $item['deal_price'] - $item['closing_price']; |
|
|
|
// $float = $item['deal_price'] - $item['closing_price']; |
|
|
|
$float = bcsub($item['deal_price'], $item['closing_price'], 18); |
|
|
|
} |
|
|
|
|
|
|
|
$orderNumber = number_format($item['order_number'], '18', '.', ''); |
|
|
@ -2028,6 +2049,11 @@ class OrderService extends AdminBaseService |
|
|
|
$float = bcmul($float, $item['order_number'], 18); |
|
|
|
$orderAmount = bcmul($orderNumber, $orderPrice, 18); |
|
|
|
|
|
|
|
if (in_array($market_type, [21])) { // 一些市场类型字段不一样,比如黄金期货没有stock_id,而是用的contract_id |
|
|
|
$stockIdOrContractId = $item['contract_id']; |
|
|
|
} else { |
|
|
|
$stockIdOrContractId = $item['stock_id']; |
|
|
|
} |
|
|
|
$rows[] = [ |
|
|
|
'trade_id' => $item['trade_id'], // |
|
|
|
'user_no' => $userNoArr[$item['user_id']] ?? '-', // 用户号 |
|
|
@ -2035,7 +2061,7 @@ class OrderService extends AdminBaseService |
|
|
|
'closing_time' => $item['closing_time'], // 平仓时间 |
|
|
|
'trade_type' => $item['trade_type'] == 1 ? '买涨' : '买跌', |
|
|
|
'order_money' => $orderAmount, // 订单金额 |
|
|
|
'stock_id' => $item['stock_id'], // 股票代码 |
|
|
|
'stock_id' => $stockIdOrContractId, // 股票代码 |
|
|
|
'order_number' => $item['order_number'], // 数量 |
|
|
|
'service_cost' => $item['service_cost'], // 服务费 |
|
|
|
'closing_cost' => $item['closing_cost'], // 平仓服务费 |
|
|
@ -2866,9 +2892,11 @@ class OrderService extends AdminBaseService |
|
|
|
foreach ($list as $item) { |
|
|
|
// 计算浮动盈亏 |
|
|
|
if ($item['trade_type'] == 1) { |
|
|
|
$float = $item['closing_price'] - $item['deal_price']; |
|
|
|
// $float = $item['closing_price'] - $item['deal_price']; |
|
|
|
$float = bcsub($item['closing_price'], $item['deal_price'], 18); |
|
|
|
} else { |
|
|
|
$float = $item['deal_price'] - $item['closing_price']; |
|
|
|
// $float = $item['deal_price'] - $item['closing_price']; |
|
|
|
$float = bcsub($item['deal_price'], $item['closing_price'], 18); |
|
|
|
} |
|
|
|
$float = bcmul($float, $item['order_number'], 18); |
|
|
|
|
|
|
|