Browse Source

fix: jp 搜索

master
liyang 2 days ago
parent
commit
088ed514ab
  1. 14
      app/admin/service/setting/StockMarketService.php

14
app/admin/service/setting/StockMarketService.php

@ -9,6 +9,7 @@ use app\model\StockGBXListModel;
use app\model\StockHkdListModel; use app\model\StockHkdListModel;
use app\model\StockIdnListModel; use app\model\StockIdnListModel;
use app\model\StockInListModel; use app\model\StockInListModel;
use app\model\StockJpListModel;
use app\model\StockListModel; use app\model\StockListModel;
use app\model\StockMarketModel; use app\model\StockMarketModel;
use app\model\StockMysListModel; use app\model\StockMysListModel;
@ -329,9 +330,6 @@ class StockMarketService extends AdminBaseService
if (empty($param['lever_max']) || !is_numeric($param['lever_max']) || $param['lever_max'] <= 0 || $param['lever_max'] < $param['lever_min']) { if (empty($param['lever_max']) || !is_numeric($param['lever_max']) || $param['lever_max'] <= 0 || $param['lever_max'] < $param['lever_min']) {
return $this->toData('1', '最大杠杆无效', []); return $this->toData('1', '最大杠杆无效', []);
} }
} }
$stockMin = $param['stock_min']; $stockMin = $param['stock_min'];
$leverMin = ceil($param['lever_min']); $leverMin = ceil($param['lever_min']);
@ -410,8 +408,7 @@ class StockMarketService extends AdminBaseService
$where[] = ['stock_code', 'like', '%' . $param['stock_code']]; $where[] = ['stock_code', 'like', '%' . $param['stock_code']];
} }
switch ($param['market_type']) switch ($param['market_type']) {
{
// 美股 // 美股
case StockMarketModel::STOCK_MARKET_USA: case StockMarketModel::STOCK_MARKET_USA:
$stockList = StockListModel::where($where)->page($param['page'], $param['limit'])->select(); $stockList = StockListModel::where($where)->page($param['page'], $param['limit'])->select();
@ -449,6 +446,10 @@ class StockMarketService extends AdminBaseService
$stockList = StockEurListModel::where($where)->page($param['page'], $param['limit'])->select(); $stockList = StockEurListModel::where($where)->page($param['page'], $param['limit'])->select();
$total = StockEurListModel::where($where)->count(); $total = StockEurListModel::where($where)->count();
break; break;
case StockMarketModel::STOCK_MARKET_JP:
$stockList = StockJpListModel::where($where)->page($param['page'], $param['limit'])->select();
$total = StockJpListModel::where($where)->count();
break;
default: default:
return $this->toData('1', '股票市场无效', []); return $this->toData('1', '股票市场无效', []);
} }
@ -480,8 +481,7 @@ class StockMarketService extends AdminBaseService
} }
switch ($param['market_type']) switch ($param['market_type']) {
{
// 美股 // 美股
case StockMarketModel::STOCK_MARKET_USA: case StockMarketModel::STOCK_MARKET_USA:
$stock = StockListModel::where('id', $param['stock_id'])->find(); $stock = StockListModel::where('id', $param['stock_id'])->find();

Loading…
Cancel
Save