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
649687aa
Commit
649687aa
authored
Jun 28, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
5462e1c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Statement.php
application/api_broker/controller/Statement.php
+5
-5
OPartialCommission.php
application/model/OPartialCommission.php
+1
-0
No files found.
application/api_broker/controller/Statement.php
View file @
649687aa
...
...
@@ -39,7 +39,7 @@ class Statement extends Basic
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
// big_log('日报周报获取新增数据-dayStatement');
big_log
(
$params
);
// big_log(json_encode($params)
);
if
(
!
isset
(
$params
[
"agent_id"
])
||
!
isset
(
$params
[
"time_start"
])
||
!
isset
(
$params
[
"time_end"
]))
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
...
...
@@ -248,18 +248,19 @@ class Statement extends Basic
$field
=
"id,store_id,district_id,level,name,phone,sex,status"
;
$agentModel
=
new
AAgents
();
$agent_result
=
$agentModel
->
getAgentById
(
$field
,
[
"agent_id"
=>
$params
[
"agent_id"
]
]);
if
(
!
$agent_result
){
return
$this
->
response
(
"200"
,
"request is null"
);
}
$store_id
=
$agent_result
[
0
][
"store_id"
];
$district_id
=
$agent_result
[
0
][
"district_id"
];
switch
(
$agent_result
[
0
][
"level"
])
{
case
10
:
#业务员
$agent_level
=
0
;
$result
=
$this
->
service_
->
selectStatementForClerk
(
$params
[
"agent_id"
],
$this
->
siteId
);
$result
=
$this
->
service_
->
selectStatementForClerk
(
$params
[
"agent_id"
],
$agent_level
,
$store_id
,
$district_id
);
break
;
case
20
:
#店长
...
...
@@ -276,8 +277,7 @@ class Statement extends Basic
#总监
$agent_level
=
2
;
if
(
$params
[
"type"
]
==
0
){
#日报
$result
=
$this
->
service_
->
selectStatementForDistrictWithDay
(
$params
[
"agent_id"
],
$agent_level
,
$store_id
,
$district_id
);
$result
=
$this
->
service_
->
selectStatementForDistrictWithDay
(
$agent_level
,
$district_id
);
}
else
{
#周报
$result
=
$this
->
service_
->
selectStatementForDistrictWithWeek
(
$params
[
"agent_id"
],
$agent_level
,
$store_id
,
$district_id
);
...
...
application/model/OPartialCommission.php
View file @
649687aa
...
...
@@ -42,6 +42,7 @@ class OPartialCommission extends BaseModel
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
select
();
big_log
(
$this
->
getLastSql
());
$m_agent
=
new
AAgents
();
$fields_str
=
'a.id,a.name,a.phone,b.store_name'
;
foreach
(
$data
as
$k
=>
$v
)
{
...
...
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