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
48a7b87f
Commit
48a7b87f
authored
Mar 12, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整后的带看id
parent
cf6e99f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
OrderLogService.php
application/api_broker/service/OrderLogService.php
+1
-1
OPayLogAdjustment.php
application/model/OPayLogAdjustment.php
+1
-0
No files found.
application/api_broker/service/OrderLogService.php
View file @
48a7b87f
...
...
@@ -661,7 +661,7 @@ class OrderLogService
}
}
//调整
$field_adjustment
=
"a.id,a.paylog_id,a.new_paylog_id,a.type,a.money,a.create_time,a.update_time,c.name"
;
$field_adjustment
=
"a.id,a.paylog_id,a.new_paylog_id,
d.order_id,
a.type,a.money,a.create_time,a.update_time,c.name"
;
$adjustmentData
=
$oPayLogAdjustmentModel
->
getAdjustmentListByOrderId
(
$field_adjustment
,
[
"order_id"
=>
$order_id
,
'is_del'
=>
0
]);
if
(
count
(
$adjustmentData
)
>
0
)
{
foreach
(
$adjustmentData
as
$k2
=>
$v2
)
{
...
...
application/model/OPayLogAdjustment.php
View file @
48a7b87f
...
...
@@ -55,6 +55,7 @@ class OPayLogAdjustment extends BaseModel{
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"o_paylog b"
,
"a.paylog_id=b.id"
)
->
join
(
"o_paylog d"
,
"a.new_paylog_id=d.id"
)
->
join
(
"a_agents c"
,
"a.operation_id=c.id"
)
->
where
(
$where_
)
->
select
();
...
...
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