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
bd050d24
Commit
bd050d24
authored
Jul 15, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
time
parent
d1dbf09b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
16 deletions
+7
-16
Finance.php
application/index/controller/Finance.php
+7
-16
No files found.
application/index/controller/Finance.php
View file @
bd050d24
...
...
@@ -2650,22 +2650,14 @@ class Finance extends Basic
$content
=
''
;
if
(
$data_arr
[
'agent_id'
]
!=
$this
->
params
[
'agent_id'
])
{
$agent_id
[
0
]
=
$data_arr
[
'agent_id'
];
$agent_id
[
1
]
=
$this
->
params
[
'agent_id'
];
$m_agent
=
new
AAgents
();
$agent_data
=
$m_agent
->
getAgentById
(
'id,name,phone,district_id,store_id'
,
[
'in_id'
=>
$agent_id
]);
foreach
(
$agent_data
as
$v
)
{
if
(
$v
[
'id'
]
==
$data_arr
[
'agent_id'
])
{
$this
->
totalOfficialReceiptsV2
(
$v
[
'id'
],
$v
[
'district_id'
],
$v
[
'store_id'
],
$data
[
'create_time'
],
$data
[
'income_time'
]);
$content
.=
'【分佣方:'
.
$v
[
'name'
]
.
'-'
.
$v
[
'phone'
]
.
'】'
;
}
$redis
=
new
RedisCacheService
();
$old_agent
=
$redis
->
getRedisCache
(
2
,
$data_arr
[
'agent_id'
]);
$this
->
totalOfficialReceiptsV2
(
$old_agent
[
'id'
],
$old_agent
[
'district_id'
],
$old_agent
[
'store_id'
],
$data_arr
[
'create_time'
],
$data_arr
[
'income_time'
]);
$content
.=
'【分佣方:'
.
$old_agent
[
'name'
]
.
'-'
.
$old_agent
[
'phone'
]
.
'】'
;
if
(
$v
[
'id'
]
==
$this
->
params
[
'agent_id'
])
{
$this
->
totalOfficialReceiptsV2
(
$v
[
'id'
],
$v
[
'district_id'
],
$v
[
'store_id'
],
$data
[
'create_time'
],
$data
[
'income_time'
]);
$content
.=
'【修改为:'
.
$v
[
'name'
]
.
'-'
.
$v
[
'phone'
]
.
'】'
;
}
}
$new_agent
=
$redis
->
getRedisCache
(
2
,
$this
->
params
[
'agent_id'
]);
$this
->
totalOfficialReceiptsV2
(
$new_agent
[
'id'
],
$new_agent
[
'district_id'
],
$new_agent
[
'store_id'
],
$data_arr
[
'create_time'
],
$data_arr
[
'income_time'
]);
$content
.=
'【修改为:'
.
$new_agent
[
'name'
]
.
'-'
.
$new_agent
[
'phone'
]
.
'】'
;
}
if
(
$this
->
params
[
'scale'
]
!=
$data_arr
[
'scale'
])
{
...
...
@@ -2919,7 +2911,6 @@ class Finance extends Basic
//获取被修改人信息
$m_agent_total
=
new
TAgentTotalModel
();
$where_bargain
[
'agent_id'
]
=
$agent_id
;
if
(
!
empty
(
$create_time
)
&&
$income_time
==
$create_time
)
{
//处理同一天
$date
=
date
(
'Y-m-d'
,
strtotime
(
$create_time
));
$where_bargain
[
'create_time'
]
=
[
'BETWEEN'
,
[
$date
.
' 00:00:00'
,
$date
.
' 23:59:59'
]];
...
...
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