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
b7234f3a
Commit
b7234f3a
authored
Oct 12, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
site_id
parent
69222ecb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
PayLog.php
application/index/controller/PayLog.php
+5
-2
No files found.
application/index/controller/PayLog.php
View file @
b7234f3a
...
...
@@ -291,7 +291,7 @@ class PayLog extends Basic
}
if
(
isset
(
$params
[
'site_id'
]))
{
$where
[
'site_id'
]
=
$params
[
'site_id'
];
$where
[
'
e.
site_id'
]
=
$params
[
'site_id'
];
}
return
$where
;
}
...
...
@@ -707,13 +707,16 @@ class PayLog extends Basic
$where
[]
=
[
'EXP'
,
'(select id from o_refund where pay_log_id=a.id and is_del = 0 group by pay_log_id) is null'
];
$where
[]
=
[
'EXP'
,
'(select id from o_paylog_adjustment where paylog_id=a.id and is_del = 0 group by paylog_id) is null '
];
}
if
(
isset
(
$this
->
params
[
'site_id'
]))
{
$where
[
'e.site_id'
]
=
$this
->
params
[
'site_id'
];
}
try
{
$order
=
new
OPayLogModel
();
if
(
empty
(
$this
->
params
[
'excel'
]))
{
$field
=
'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,'
;
$field
.=
'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name'
;
$list
=
$order
->
getAddPayLogOrderListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$m_pay_adjustment
=
new
OPayLogAdjustment
();
$m_report
=
new
OReportModel
();
$m_refund
=
new
ORefundModel
();
...
...
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