|
@@ -23,15 +23,19 @@ class Seller extends Common |
|
@@ -23,15 +23,19 @@ class Seller extends Common |
|
23
|
$version_expire = isset($data['version_expire']) ? $data['version_expire'] : 0;
|
23
|
$version_expire = isset($data['version_expire']) ? $data['version_expire'] : 0;
|
|
24
|
$online = $data['online'] ? $data['channel'] : '';
|
24
|
$online = $data['online'] ? $data['channel'] : '';
|
|
25
|
|
25
|
|
|
26
|
- if($version_expire){
|
|
|
|
27
|
- $versionTime = array(7=>3600*24*7,15=>3600*24*15,30=>3600*24*30);
|
|
|
|
28
|
- }
|
26
|
+
|
|
29
|
|
27
|
|
|
30
|
$where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
|
28
|
$where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
|
|
31
|
$where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
|
29
|
$where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
|
|
32
|
$where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
|
30
|
$where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
|
|
33
|
$where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
|
31
|
$where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
|
|
34
|
- $where .= $version_expire ? ' and (v.edate-'.$versionTime[$version_expire].')<'.time():'';
|
32
|
+ if($version_expire && $version_expire>1){
|
|
|
|
33
|
+ $versionTime = array(7=>3600*24*7,15=>3600*24*15,30=>3600*24*30);
|
|
|
|
34
|
+ $where .= $version_expire ? ' and (v.edate-'.$versionTime[$version_expire].')<'.time():'';
|
|
|
|
35
|
+ }else{
|
|
|
|
36
|
+ $where .= ' and v.edate<'.time();
|
|
|
|
37
|
+ }
|
|
|
|
38
|
+
|
|
35
|
switch ($data['online']) {
|
39
|
switch ($data['online']) {
|
|
36
|
case '1':
|
40
|
case '1':
|
|
37
|
$where .= ' and s.is_online_reserve = 1';
|
41
|
$where .= ' and s.is_online_reserve = 1';
|
