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
50826c26
Commit
50826c26
authored
May 31, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成交报告审核
parent
a3198cfc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Finance.php
application/index/controller/Finance.php
+3
-1
OBargainModel.php
application/model/OBargainModel.php
+1
-1
No files found.
application/index/controller/Finance.php
View file @
50826c26
...
...
@@ -71,7 +71,7 @@ class Finance extends Basic
a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number'
;
$where
[
'a.father_id'
]
=
0
;
// $where['c.is_del'] = 0;
$where
[
'a.status'
]
=
1
0
;
$where
[
'a.status'
]
=
1
1
;
$order
=
'e.id desc'
;
if
(
!
empty
(
$this
->
params
[
'create_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
...
...
@@ -1136,6 +1136,8 @@ class Finance extends Basic
$data
[
'is_del'
]
=
1
;
$data
=
$m_financial
->
editData
(
$data
,
$this
->
params
[
'bargain_id'
],
'bargain_id'
);
$m_bargain
=
new
OBargainModel
();
$m_bargain
->
updateBargainById
(
$this
->
params
[
'bargain_id'
],
[
'status'
=>
10
]);
$msg
=
''
;
if
(
$data
>
0
)
{
$code
=
200
;
...
...
application/model/OBargainModel.php
View file @
50826c26
...
...
@@ -380,7 +380,7 @@ class OBargainModel extends Model
*/
public
function
addCheckBargain
(
int
$id
,
array
$data
,
int
$source
,
int
$status
)
:
bool
{
$this
->
startTrans
();
//
$this->startTrans();
$bargain_data
=
$this
->
field
(
'id,report_id,agent_id,order_no,order_id'
)
->
where
([
'id'
=>
$id
,
'status'
=>
[
'in'
,
'10,11'
]
...
...
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