Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
1266a54b
Commit
1266a54b
authored
Sep 04, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alias
parent
66163a77
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
OfficePayLog.php
application/index/controller/OfficePayLog.php
+2
-2
PayLog.php
application/index/controller/PayLog.php
+1
-1
OPayLogModel.php
application/model/OPayLogModel.php
+2
-2
No files found.
application/index/controller/OfficePayLog.php
View file @
1266a54b
...
@@ -2600,12 +2600,12 @@ class OfficePayLog extends Basic
...
@@ -2600,12 +2600,12 @@ class OfficePayLog extends Basic
//提交人所在门店
//提交人所在门店
if
(
!
empty
(
$this
->
params
[
'store_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'store_id'
]))
{
$where
[
'
e
.store_id'
]
=
$this
->
params
[
'store_id'
];
$where
[
'
c
.store_id'
]
=
$this
->
params
[
'store_id'
];
}
}
//提交人所在部门
//提交人所在部门
if
(
!
empty
(
$this
->
params
[
'district_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'district_id'
]))
{
$where
[
'
e
.district_id'
]
=
$this
->
params
[
'district_id'
];
$where
[
'
c
.district_id'
]
=
$this
->
params
[
'district_id'
];
}
}
//提交人姓名
//提交人姓名
...
...
application/index/controller/PayLog.php
View file @
1266a54b
...
@@ -86,7 +86,7 @@ class PayLog extends Basic
...
@@ -86,7 +86,7 @@ class PayLog extends Basic
try
{
try
{
$order
=
new
OPayLogModel
();
$order
=
new
OPayLogModel
();
$field
=
'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,
c
.name,a.real_money'
;
$field
=
'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,
e
.name,a.real_money'
;
$list
=
$order
->
getPayLogOrderListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$list
=
$order
->
getPayLogOrderListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'total'
]
=
$order
->
getPayLogOrderListLimitTotal
(
$where
);
$data
[
'total'
]
=
$order
->
getPayLogOrderListLimitTotal
(
$where
);
$data
[
'list'
]
=
$list
;
$data
[
'list'
]
=
$list
;
...
...
application/model/OPayLogModel.php
View file @
1266a54b
...
@@ -756,7 +756,7 @@ class OPayLogModel extends Model
...
@@ -756,7 +756,7 @@ class OPayLogModel extends Model
return
$this
->
db_
->
field
(
$field
)
return
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
'a_agents
c'
,
'a.agent_id=c
.id'
,
'left'
)
->
join
(
'a_agents
e'
,
'a.agent_id=e
.id'
,
'left'
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
->
order
(
$order_
)
->
order
(
$order_
)
...
@@ -775,7 +775,7 @@ class OPayLogModel extends Model
...
@@ -775,7 +775,7 @@ class OPayLogModel extends Model
return
$this
->
db_
->
field
(
$field
)
return
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
'a_agents
c'
,
'a.agent_id=c
.id'
,
'left'
)
->
join
(
'a_agents
e'
,
'a.agent_id=e
.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
count
(
$field
);
->
count
(
$field
);
}
}
...
...
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