Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
stock_new
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sugar
stock_new
Commits
3cd45ec0
Commit
3cd45ec0
authored
Jun 19, 2024
by
wuxiaoli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
持仓列表
parent
5d4c17f5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
281 deletions
+8
-281
application/market/home/Trade.php
application/market/home/Trade.php
+1
-1
application/market/model/Deal_stock.php
application/market/model/Deal_stock.php
+2
-1
application/market/model/Delivery.php
application/market/model/Delivery.php
+2
-1
application/market/model/StockPosition.php
application/market/model/StockPosition.php
+0
-277
application/market/model/Trust.php
application/market/model/Trust.php
+3
-1
No files found.
application/market/home/Trade.php
View file @
3cd45ec0
This diff is collapsed.
Click to expand it.
application/market/model/Deal_stock.php
View file @
3cd45ec0
...
...
@@ -69,7 +69,7 @@ class Deal_stock extends Model{
* 返回子账号成交
* $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
(
$beginday
)){
$beginday
=
strtotime
(
date
(
"Y-m-d"
,
time
()));}
else
{
$beginday
=
strtotime
(
$beginday
);}
...
...
@@ -80,6 +80,7 @@ class Deal_stock extends Model{
->
where
(
'deal_date'
,
'>='
,
$beginday
)
->
where
(
'deal_date'
,
'<='
,
$endday
)
->
order
(
'id desc'
)
->
paginate
(
$offset
,
false
,
[
'query'
=>
request
()
->
param
()])
->
select
();
if
(
!
$res
||
count
(
$res
)
===
0
){
...
...
application/market/model/Delivery.php
View file @
3cd45ec0
...
...
@@ -57,7 +57,7 @@ class Delivery extends Model{
* 返回对应交割单
* $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
(
$beginday
)){
$beginday
=
strtotime
(
date
(
"Y-m-d"
,
time
()));}
else
{
$beginday
=
strtotime
(
$beginday
);}
$res
=
Db
::
name
(
'stock_delivery_order'
)
...
...
@@ -66,6 +66,7 @@ class Delivery extends Model{
->
where
(
'deal_date'
,
'>='
,
$beginday
)
->
where
(
'deal_date'
,
'<='
,
$endday
)
->
order
(
'id desc'
)
->
paginate
(
$offset
,
false
,
[
'query'
=>
request
()
->
param
()])
->
select
();
return
$res
;
}
...
...
application/market/model/StockPosition.php
deleted
100644 → 0
View file @
5d4c17f5
This diff is collapsed.
Click to expand it.
application/market/model/Trust.php
View file @
3cd45ec0
...
...
@@ -234,13 +234,15 @@ class Trust extends Model{
* 返回子账号委托
* $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
(
$beginday
)){
$beginday
=
strtotime
(
date
(
"Y-m-d"
,
time
()));}
else
{
$beginday
=
strtotime
(
$beginday
);}
$res
=
Db
::
name
(
'stock_trust'
)
->
where
([
'sub_id'
=>
$sub_id
])
->
where
(
'trust_date'
,
'>='
,
$beginday
)
->
where
(
'trust_date'
,
'<='
,
$endday
)
->
order
(
'id desc'
)
->
paginate
(
$offset
,
false
,
[
'query'
=>
request
()
->
param
()])
->
select
();
return
$res
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment