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
b42a149d
Commit
b42a149d
authored
Jun 13, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务日志修改
parent
627ab600
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
Finance.php
application/index/controller/Finance.php
+6
-4
Remark.php
application/index/controller/Remark.php
+0
-3
OBargainModel.php
application/model/OBargainModel.php
+6
-3
No files found.
application/index/controller/Finance.php
View file @
b42a149d
...
@@ -1258,8 +1258,8 @@ class Finance extends Basic
...
@@ -1258,8 +1258,8 @@ class Finance extends Basic
}
}
//商铺地址
//商铺地址
if
(
!
empty
(
$this
->
params
[
'
house
_address'
]))
{
if
(
!
empty
(
$this
->
params
[
'
internal
_address'
]))
{
$where
[
'a.step_content'
]
=
[
'like'
,
'%'
.
$this
->
params
[
'
house
_address'
]
.
'%'
];
$where
[
'a.step_content'
]
=
[
'like'
,
'%'
.
$this
->
params
[
'
internal
_address'
]
.
'%'
];
}
}
//经纪人名字
//经纪人名字
...
@@ -1294,9 +1294,11 @@ class Finance extends Basic
...
@@ -1294,9 +1294,11 @@ class Finance extends Basic
*/
*/
public
function
editRecordLog
(
int
$bargain_id
,
string
$step_content
=
''
,
int
$type
=
1
,
string
$house_number
=
''
,
int
$is_open
=
0
)
{
public
function
editRecordLog
(
int
$bargain_id
,
string
$step_content
=
''
,
int
$type
=
1
,
string
$house_number
=
''
,
int
$is_open
=
0
)
{
$m_bargain
=
new
OBargainModel
();
$house_number
=
$m_bargain
->
getCheckBargain
(
'a.house_number,c.internal_address'
,
(
int
)
$bargain_id
);
$step_content
.=
"[
{
$house_number
[
'internal_address'
]
}
]"
;
if
(
empty
(
$house_number
))
{
if
(
empty
(
$house_number
))
{
$m_bargain
=
new
OBargainModel
();
$house_number
=
$m_bargain
->
getCheckBargain
(
'house_number'
,
(
int
)
$bargain_id
);
$house_number
=
$house_number
[
'house_number'
];
$house_number
=
$house_number
[
'house_number'
];
}
}
...
...
application/index/controller/Remark.php
View file @
b42a149d
...
@@ -41,9 +41,6 @@ class Remark extends Basic
...
@@ -41,9 +41,6 @@ class Remark extends Basic
$u_phone_follow
=
new
UPhoneFollowPp
();
$u_phone_follow
=
new
UPhoneFollowPp
();
$where
[
'e.store_name'
]
=
[
'NULL'
];
$where
[
'f.district_name'
]
=
[
'NULL'
];
if
(
!
empty
(
$this
->
params
[
'start_date'
])
&&
empty
(
$this
->
params
[
'end_date'
]))
{
if
(
!
empty
(
$this
->
params
[
'start_date'
])
&&
empty
(
$this
->
params
[
'end_date'
]))
{
$where
[
'a.create_time'
]
=
[
'> time'
,
$this
->
params
[
'start_date'
]
.
' 00:00:00'
];
$where
[
'a.create_time'
]
=
[
'> time'
,
$this
->
params
[
'start_date'
]
.
' 00:00:00'
];
}
}
...
...
application/model/OBargainModel.php
View file @
b42a149d
...
@@ -943,9 +943,11 @@ class OBargainModel extends Model
...
@@ -943,9 +943,11 @@ class OBargainModel extends Model
*/
*/
public
function
getCheckBargain
(
string
$field
,
int
$id
)
public
function
getCheckBargain
(
string
$field
,
int
$id
)
{
{
return
$this
->
field
(
$field
)
return
$this
->
field
(
$field
)
->
alias
(
'a'
)
->
where
(
'status'
,
'in'
,
'10,11'
)
->
join
(
'o_order b'
,
'a.order_id=b.id'
,
'left'
)
->
where
(
'id'
,
$id
)
->
join
(
'g_houses c'
,
'b.house_id=c.id'
,
'left'
)
->
where
(
'a.status'
,
'in'
,
'10,11'
)
->
where
(
'a.id'
,
$id
)
->
find
();
->
find
();
}
}
}
}
\ No newline at end of file
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