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
d91b6dec
Commit
d91b6dec
authored
Sep 20, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9aa8ffc8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
ClinchMap.php
application/index/controller/ClinchMap.php
+3
-3
OBargainModel.php
application/model/OBargainModel.php
+1
-0
No files found.
application/index/controller/ClinchMap.php
View file @
d91b6dec
...
...
@@ -78,7 +78,7 @@ class ClinchMap extends Basic
$m_bargain
=
new
OBargainModel
();
$conditions
=
[];
$performanceSum
=
$m_bargain
->
getAddBargainNumClinchMap
(
$conditions
);
$shop_bargain_num
=
isset
(
$performanceSum
[
0
][
"num"
])
?
$performanceSum
[
0
][
"num"
]
:
0
;
$shop_bargain_num
=
$performanceSum
?
count
(
$performanceSum
)
:
0
;
return
$shop_bargain_num
;
}
...
...
@@ -136,12 +136,12 @@ class ClinchMap extends Basic
$conditions
[
'a.create_time'
]
=
array
(
'between'
,
array
(
$start_time
.
" 00:00:00"
,
$end_time
.
" 23:59:59"
)
);
$conditions
[
'c.city'
]
=
$v
[
'city'
];
$performanceSum
=
$m_bargain
->
getAddBargainNumClinchMap
(
$conditions
);
$month_bargain_num
=
isset
(
$performanceSum
[
0
][
"num"
])
?
$performanceSum
[
0
][
"num"
]
:
0
;
$month_bargain_num
=
$performanceSum
?
count
(
$performanceSum
)
:
0
;
$city_arr
[
$key
][
'month_bargain_num'
]
=
$month_bargain_num
;
$conditions
=
[];
$conditions
[
'c.city'
]
=
$key
;
$performanceSum
=
$m_bargain
->
getAddBargainNumClinchMap
(
$conditions
);
$all_bargain_num
=
isset
(
$performanceSum
[
0
][
"num"
])
?
$performanceSum
[
0
][
"num"
]
:
0
;
$all_bargain_num
=
$performanceSum
?
count
(
$performanceSum
)
:
0
;
$city_arr
[
$key
][
'all_bargain_num'
]
=
$all_bargain_num
;
}
return
$city_arr
;
...
...
application/model/OBargainModel.php
View file @
d91b6dec
...
...
@@ -1651,6 +1651,7 @@ class OBargainModel extends Model
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"g_houses c"
,
"b.house_id = c.id"
,
"left"
)
->
where
(
$params
)
->
group
(
'b.house_id'
)
->
select
();
// big_log($this->getLastSql());
return
$return
;
...
...
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