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
58438bad
Commit
58438bad
authored
Sep 04, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7635b85d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
AmercementService.php
application/index/service/AmercementService.php
+6
-1
No files found.
application/index/service/AmercementService.php
View file @
58438bad
...
@@ -268,7 +268,7 @@ class AmercementService
...
@@ -268,7 +268,7 @@ class AmercementService
$conditions
=
[];
$conditions
=
[];
$conditions
[
"id"
]
=
$id
;
$conditions
[
"id"
]
=
$id
;
$field
=
"id,status,type,money,submit_agent_id,agent_id,remarks,create_time"
;
$field
=
"id,status,type,money,submit_agent_id,agent_id,remarks,create_time
,operation_id,operation_time
"
;
$result
=
$this
->
m_amercement
->
getAmercementInfo
(
$conditions
,
$field
);
$result
=
$this
->
m_amercement
->
getAmercementInfo
(
$conditions
,
$field
);
if
(
!
$result
){
if
(
!
$result
){
...
@@ -291,6 +291,11 @@ class AmercementService
...
@@ -291,6 +291,11 @@ class AmercementService
$result
[
'forfeit_penalty'
]
=
$forfeit_penalty
;
$result
[
'forfeit_penalty'
]
=
$forfeit_penalty
;
$result
[
'money_sum'
]
=
$forfeit_penalty
+
$result
[
'money'
];
$result
[
'money_sum'
]
=
$forfeit_penalty
+
$result
[
'money'
];
$result
[
'pay_time'
]
=
''
;
$result
[
'pay_time'
]
=
''
;
$result
[
'operation_name'
]
=
''
;
if
(
$result
[
'operation_id'
]){
$agent_data
=
$redis_cache
->
getRedisCache
(
2
,
$result
[
'operation_id'
]);
$result
[
'operation_name'
]
=
$agent_data
[
'name'
];
}
}
}
$result
[
'img'
]
=
$this
->
getAmercementImage
(
$result
[
'id'
]);
$result
[
'img'
]
=
$this
->
getAmercementImage
(
$result
[
'id'
]);
...
...
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