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
23c1c9f9
Commit
23c1c9f9
authored
Jun 21, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
//
parent
53b2f73e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OfficePayLog.php
application/index/controller/OfficePayLog.php
+1
-1
OfficeORefundModel.php
application/model/OfficeORefundModel.php
+3
-3
No files found.
application/index/controller/OfficePayLog.php
View file @
23c1c9f9
...
...
@@ -1495,7 +1495,7 @@ class OfficePayLog extends Basic
}
else
{
$list
[
$k
][
'bargain_id'
]
=
''
;
}
die
(
'111'
);
$list
[
$k
][
'current_agent_name'
]
=
$list
[
$k
][
'store_name'
]
=
""
;
if
(
$v
[
'type'
]
==
92
)
{
$is_exclusive_type
=
$m_room
->
getFieldOneValue
(
'is_exclusive_type'
,
[
'id'
=>
$v
[
'house_id'
]]);
...
...
application/model/OfficeORefundModel.php
View file @
23c1c9f9
...
...
@@ -229,7 +229,7 @@ class OfficeORefundModel extends Model{
return
$this
->
db_
->
alias
(
'a'
)
->
field
(
$field
)
->
join
(
'office_o_order b'
,
'a.order_id = b.id'
,
'left'
)
->
join
(
'
office_
a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'office_o_paylog d'
,
'a.pay_log_id = d.id'
,
'left'
)
->
join
(
'office_o_refund_log e'
,
'a.id = e.refund_id'
,
'left'
)
->
join
(
'office_o_bargain f'
,
'd.bargain_id = f.id'
,
'left'
)
...
...
@@ -264,7 +264,7 @@ class OfficeORefundModel extends Model{
public
function
getCheckRefundListTotal
(
$params
)
{
return
$this
->
db_
->
alias
(
'a'
)
->
join
(
'office_o_order b'
,
'a.order_id = b.id'
,
'left'
)
->
join
(
'
office_
a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'office_o_paylog d'
,
'a.pay_log_id = d.id'
,
'left'
)
->
join
(
'office_o_refund_log e'
,
'a.id = e.refund_id'
,
'left'
)
->
join
(
'office_o_bargain f'
,
'd.bargain_id = f.id'
,
'left'
)
...
...
@@ -306,7 +306,7 @@ class OfficeORefundModel extends Model{
$refund_money
=
$this
->
db_
->
alias
(
'a'
)
->
field
(
'a.refund_money'
)
->
join
(
'office_o_order b'
,
'a.order_id = b.id'
,
'left'
)
->
join
(
'
office_
a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'a_agents c'
,
'a.agent_id = c.id'
,
'left'
)
->
join
(
'office_o_paylog d'
,
'a.pay_log_id = d.id'
,
'left'
)
->
join
(
'office_o_refund_log e'
,
'a.id = e.refund_id'
,
'left'
)
->
join
(
'office_o_bargain f'
,
'd.bargain_id = f.id'
,
'left'
)
...
...
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