Commit 3cd45ec0 authored by wuxiaoli's avatar wuxiaoli

持仓列表

parent 5d4c17f5
This diff is collapsed.
...@@ -69,7 +69,7 @@ class Deal_stock extends Model{ ...@@ -69,7 +69,7 @@ class Deal_stock extends Model{
* 返回子账号成交 * 返回子账号成交
* $sub_id 子账号 * $sub_id 子账号
*/ */
public function get_deal_stock($sub_id,$beginday,$endday){ public function get_deal_stock($sub_id,$beginday,$endday,$offset=15){
if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);} if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);}
if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);} if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
...@@ -80,6 +80,7 @@ class Deal_stock extends Model{ ...@@ -80,6 +80,7 @@ class Deal_stock extends Model{
->where('deal_date','>=',$beginday) ->where('deal_date','>=',$beginday)
->where('deal_date','<=',$endday) ->where('deal_date','<=',$endday)
->order('id desc') ->order('id desc')
->paginate($offset, false, ['query' => request()->param()])
->select(); ->select();
if(!$res||count($res)===0){ if(!$res||count($res)===0){
......
...@@ -57,7 +57,7 @@ class Delivery extends Model{ ...@@ -57,7 +57,7 @@ class Delivery extends Model{
* 返回对应交割单 * 返回对应交割单
* $sub_id 子账号 * $sub_id 子账号
*/ */
public function get_delivery_order($sub_id,$beginday="",$endday=""){ public function get_delivery_order($sub_id,$beginday="",$endday="",$offset=15){
if(empty($endday)){$endday=time();}else{$endday=strtotime($endday)+86400;} if(empty($endday)){$endday=time();}else{$endday=strtotime($endday)+86400;}
if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);} if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
$res=Db::name('stock_delivery_order') $res=Db::name('stock_delivery_order')
...@@ -66,6 +66,7 @@ class Delivery extends Model{ ...@@ -66,6 +66,7 @@ class Delivery extends Model{
->where('deal_date','>=',$beginday) ->where('deal_date','>=',$beginday)
->where('deal_date','<=',$endday) ->where('deal_date','<=',$endday)
->order('id desc') ->order('id desc')
->paginate($offset, false, ['query' => request()->param()])
->select(); ->select();
return $res; return $res;
} }
......
This diff is collapsed.
...@@ -234,13 +234,15 @@ class Trust extends Model{ ...@@ -234,13 +234,15 @@ class Trust extends Model{
* 返回子账号委托 * 返回子账号委托
* $sub_id 子账号 * $sub_id 子账号
*/ */
public function get_trust($sub_id,$beginday,$endday){ public function get_trust($sub_id,$beginday,$endday,$offset=15){
if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);} if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);}
if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);} if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
$res=Db::name('stock_trust') $res=Db::name('stock_trust')
->where(['sub_id'=>$sub_id]) ->where(['sub_id'=>$sub_id])
->where('trust_date','>=',$beginday) ->where('trust_date','>=',$beginday)
->where('trust_date','<=',$endday) ->where('trust_date','<=',$endday)
->order('id desc')
->paginate($offset, false, ['query' => request()->param()])
->select(); ->select();
return $res; return $res;
} }
......
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