|
@@ -32,23 +32,32 @@ class CashTradeController
|
|
$list = sys_data('money_type');
|
|
$list = sys_data('money_type');
|
|
$new = [];
|
|
$new = [];
|
|
foreach ($list as $v) {
|
|
foreach ($list as $v) {
|
|
- if ($v['is_trade']) {
|
|
|
|
|
|
+ if (explode('_', $v['code'])[0] == "USDT") {
|
|
if ($v['price'] <= 0) {
|
|
if ($v['price'] <= 0) {
|
|
//计算前一天成交的平均价格
|
|
//计算前一天成交的平均价格
|
|
$v['price'] = CashTradeOrder::averagePrice($v['code']);
|
|
$v['price'] = CashTradeOrder::averagePrice($v['code']);
|
|
}
|
|
}
|
|
|
|
+ $usdt_price = $v['price'];
|
|
|
|
+ }
|
|
|
|
+ if ($v['is_trade']) {
|
|
|
|
+// if ($v['price'] <= 0) {
|
|
|
|
+// //计算前一天成交的平均价格
|
|
|
|
+// $v['price'] = CashTradeOrder::averagePrice($v['code']);
|
|
|
|
+// }
|
|
if ($request->uid())
|
|
if ($request->uid())
|
|
$v['wallet'] = UserMoney::initialUserMoney($request->uid(), $v['code']);
|
|
$v['wallet'] = UserMoney::initialUserMoney($request->uid(), $v['code']);
|
|
- unset($v['__money_address']);
|
|
|
|
- unset($v['__money_key']);
|
|
|
|
unset($v['cash_commission_ratio']);
|
|
unset($v['cash_commission_ratio']);
|
|
unset($v['cash_commission_type']);
|
|
unset($v['cash_commission_type']);
|
|
unset($v['can_cash']);
|
|
unset($v['can_cash']);
|
|
unset($v['can_trade']);
|
|
unset($v['can_trade']);
|
|
unset($v['is_trade']);
|
|
unset($v['is_trade']);
|
|
$new[] = $v;
|
|
$new[] = $v;
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ foreach ($new as $k => $v) {
|
|
|
|
+ $new[$k]['usdt'] = (isset($usdt_price) && $usdt_price > 0) ? bcdiv($new[$k]['price'], $usdt_price, 8) : 0;
|
|
|
|
+ }
|
|
return app('json')->success('ok', $new);
|
|
return app('json')->success('ok', $new);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -100,7 +109,7 @@ class CashTradeController
|
|
$user = $request->user();
|
|
$user = $request->user();
|
|
$uid = $user['uid'];
|
|
$uid = $user['uid'];
|
|
list($money_type, $money_num, $price, $trade_type, $trade_way, $from, $hang_time, , $captcha) = UtilService::postMore([
|
|
list($money_type, $money_num, $price, $trade_type, $trade_way, $from, $hang_time, , $captcha) = UtilService::postMore([
|
|
- ['money_type', 'USDT_ERC20', '', '', ['not_empty_check', function ($item) {
|
|
|
|
|
|
+ ['money_type', 'USDT', '', '', ['not_empty_check', function ($item) {
|
|
$moneys = sys_data('money_type');
|
|
$moneys = sys_data('money_type');
|
|
$new_money = [];
|
|
$new_money = [];
|
|
foreach ($moneys as $v) {
|
|
foreach ($moneys as $v) {
|
|
@@ -129,7 +138,12 @@ class CashTradeController
|
|
return app('json')->fail('请输入币数');
|
|
return app('json')->fail('请输入币数');
|
|
}
|
|
}
|
|
if ($price <= 0) {
|
|
if ($price <= 0) {
|
|
- return app('json')->fail('请输入单价');
|
|
|
|
|
|
+ $money = sys_data('money_type');
|
|
|
|
+ foreach ($money as $v) {
|
|
|
|
+ if ($v['code'] == $money_type) {
|
|
|
|
+ $price = $v['price'] ?: CashTradeOrder::averagePrice($v['code']);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
$sum = bcmul($money_num, $price, 2);
|
|
$sum = bcmul($money_num, $price, 2);
|
|
if ($sum >= 10000) {
|
|
if ($sum >= 10000) {
|
|
@@ -221,7 +235,7 @@ class CashTradeController
|
|
$user = $request->user();
|
|
$user = $request->user();
|
|
$uid = $user['uid'];
|
|
$uid = $user['uid'];
|
|
list($id, $trade_way, $from, , $captcha) = UtilService::postMore([
|
|
list($id, $trade_way, $from, , $captcha) = UtilService::postMore([
|
|
- ['id', 'USDT_ERC20', '', '', ['not_empty_check'], ['请选择要进行的交易']],
|
|
|
|
|
|
+ ['id', 'USDT', '', '', ['not_empty_check'], ['请选择要进行的交易']],
|
|
['trade_way', 'weixin'],
|
|
['trade_way', 'weixin'],
|
|
['from', 'weixin'],
|
|
['from', 'weixin'],
|
|
['trade_psw', '', '', '', ['not_empty_check', function ($item) use ($user) {
|
|
['trade_psw', '', '', '', ['not_empty_check', function ($item) use ($user) {
|
|
@@ -408,7 +422,8 @@ class CashTradeController
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- $res = $res && CashTradeOrder::where('id', $id)->update(['status' => 1, 'trade_time' => time()]);
|
|
|
|
|
|
+ $res = $res && CashTradeOrder::where('id', $id)->update(['status' => 1, 'trade_time' => time()])
|
|
|
|
+ && CashTradeOrder::brokerage($id);
|
|
BaseModel::checkTrans($res);
|
|
BaseModel::checkTrans($res);
|
|
if ($res) {
|
|
if ($res) {
|
|
return app('json')->fail('审核成功');
|
|
return app('json')->fail('审核成功');
|