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
026972e7
Commit
026972e7
authored
Sep 25, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
payee_agent_name
parent
8d685323
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
ApplyForCost.php
application/api_broker/controller/ApplyForCost.php
+11
-2
No files found.
application/api_broker/controller/ApplyForCost.php
View file @
026972e7
...
@@ -121,7 +121,7 @@ class ApplyForCost extends Basic
...
@@ -121,7 +121,7 @@ class ApplyForCost extends Basic
$is_check
=
$this
->
checkAuth
(
$check_url
);
//审核通过权限
$is_check
=
$this
->
checkAuth
(
$check_url
);
//审核通过权限
$field
=
'a.id,a.count_time,a.source,a.type,a.create_time,a.agent_id,a.total_fee,a.fee_item,a.purpose,'
;
$field
=
'a.id,a.count_time,a.source,a.type,a.create_time,a.agent_id,a.total_fee,a.fee_item,a.purpose,'
;
$field
.=
'b.name as agent_name,a.card_name,a.bank,a.card_no,a.source,a.store_id,a.status'
;
$field
.=
'b.name as agent_name,a.card_name,a.bank,a.card_no,a.source,a.store_id,a.status
,a.payee_agent_id
'
;
$fee_model
=
new
FApplyForFee
();
$fee_model
=
new
FApplyForFee
();
$cost_service
=
new
CostService
();
$cost_service
=
new
CostService
();
$m_img
=
new
FImg
();
$m_img
=
new
FImg
();
...
@@ -131,7 +131,8 @@ class ApplyForCost extends Basic
...
@@ -131,7 +131,8 @@ class ApplyForCost extends Basic
$source
=
[
$source
=
[
0
=>
'app申请'
,
0
=>
'app申请'
,
1
=>
'excel导入'
1
=>
'excel导入'
,
2
=>
'后台新增'
];
];
foreach
(
$list
as
$k
=>
$v
)
{
foreach
(
$list
as
$k
=>
$v
)
{
...
@@ -157,6 +158,14 @@ class ApplyForCost extends Basic
...
@@ -157,6 +158,14 @@ class ApplyForCost extends Basic
];
];
}
}
}
}
if
(
$v
[
'payee_agent_id'
])
{
$payee_agent_data
=
$redis
->
getRedisCache
(
2
,
$v
[
'payee_agent_id'
]);
$list
[
$k
][
'payee_agent_name'
]
=
$payee_agent_data
[
'name'
];
}
else
{
$list
[
$k
][
'payee_agent_name'
]
=
''
;
}
$office_name
=
$m_store
->
getStoreCost
(
'b.office_name'
,
[
'a.id'
=>
$v
[
'store_id'
]]);
$office_name
=
$m_store
->
getStoreCost
(
'b.office_name'
,
[
'a.id'
=>
$v
[
'store_id'
]]);
$list
[
$k
][
'office_name'
]
=
empty
(
$office_name
[
'office_name'
])
?
''
:
$office_name
[
'office_name'
];
$list
[
$k
][
'office_name'
]
=
empty
(
$office_name
[
'office_name'
])
?
''
:
$office_name
[
'office_name'
];
$list
[
$k
][
'image_array'
]
=
$image_array
;
$list
[
$k
][
'image_array'
]
=
$image_array
;
...
...
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