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
d95587d6
Commit
d95587d6
authored
Jul 26, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ec60ceb0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CostParameter.php
application/index/controller/CostParameter.php
+5
-5
OPartialCommission.php
application/model/OPartialCommission.php
+1
-1
No files found.
application/index/controller/CostParameter.php
View file @
d95587d6
...
...
@@ -137,6 +137,9 @@ class CostParameter extends Basic
public
function
getTransferCharge
(
$store_id
)
{
$agent_ids
=
$this
->
getUserIDList
(
$store_id
);
// big_log("======{$store_id}======");
// big_log($agent_ids);
$transfer_charge
=
0
;
foreach
(
$agent_ids
as
$k
=>
$v
)
{
$m_partial
=
new
OPartialCommission
();
...
...
@@ -146,7 +149,7 @@ class CostParameter extends Basic
$where
[
'b.status'
]
=
array
(
'in'
,
'10,11,13'
);
$where
[
'a.is_del'
]
=
0
;
$where
[
'a.agent_id'
]
=
$v
;
$where
[
'
a.creat
e_time'
]
=
[
'between'
,
[
$start_date
,
$end_date
]];
$where
[
'
c.incom
e_time'
]
=
[
'between'
,
[
$start_date
,
$end_date
]];
$list
=
$m_partial
->
getSumMoney
(
$fields
,
$where
);
if
((
isset
(
$list
[
'service_charge'
]))
&&
(
$list
[
'service_charge'
]
>
0
))
...
...
@@ -164,13 +167,10 @@ class CostParameter extends Basic
{
$params
=
[];
$params
[
"store_id"
]
=
$store_id
;
$params
[
"status"
]
=
0
;
$params
[
"status"
]
=
array
(
'in'
,
'0,1,2,3'
);
$agentModel
=
new
AAgents
();
$agentsArr
=
$agentModel
->
getAgentsByStoreId
(
$params
);
$agent_total
=
count
(
$agentsArr
);
$agentIds
=
[];
if
(
$agent_total
>
0
)
{
foreach
(
$agentsArr
as
$key1
=>
$value1
)
{
...
...
application/model/OPartialCommission.php
View file @
d95587d6
...
...
@@ -237,7 +237,7 @@ class OPartialCommission extends BaseModel
->
join
(
'o_real_income c'
,
' a.real_income_id = c.id'
,
'left'
)
->
where
(
$where
)
->
find
();
big_log
(
$this
->
getLastSql
());
//
big_log($this->getLastSql());
return
$res
;
}
...
...
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