|
@@ -20,12 +20,18 @@ class Seller extends Common |
|
@@ -20,12 +20,18 @@ class Seller extends Common |
|
20
|
|
20
|
|
|
21
|
$where = '';
|
21
|
$where = '';
|
|
22
|
$channel = $data['channel'] ? $data['channel'] : 1;
|
22
|
$channel = $data['channel'] ? $data['channel'] : 1;
|
|
|
|
23
|
+ $version_expire = isset($data['version_expire']) ? $data['version_expire'] : 0;
|
|
23
|
$online = $data['online'] ? $data['channel'] : '';
|
24
|
$online = $data['online'] ? $data['channel'] : '';
|
|
24
|
|
25
|
|
|
|
|
26
|
+ if($version_expire){
|
|
|
|
27
|
+ $versionTime = array(7=>strtotime("+7 day",time()),15=>strtotime("+15 day",time()),30=>strtotime("+30 day",time()));
|
|
|
|
28
|
+ }
|
|
|
|
29
|
+
|
|
25
|
$where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
|
30
|
$where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
|
|
26
|
$where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
|
31
|
$where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
|
|
27
|
$where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
|
32
|
$where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
|
|
28
|
$where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
|
33
|
$where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
|
|
|
|
34
|
+ $where .= $version_expire ? ' and ver.edate-'.$versionTime[$version_expire].'<'.time();
|
|
29
|
switch ($data['online']) {
|
35
|
switch ($data['online']) {
|
|
30
|
case '1':
|
36
|
case '1':
|
|
31
|
$where .= ' and s.is_online_reserve = 1';
|
37
|
$where .= ' and s.is_online_reserve = 1';
|
|
@@ -71,6 +77,7 @@ class Seller extends Common |
|
@@ -71,6 +77,7 @@ class Seller extends Common |
|
71
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid
|
77
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid
|
|
72
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
|
78
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
|
|
73
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id
|
79
|
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id
|
|
|
|
80
|
+ LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS ver ON s.id = ver.sid
|
|
74
|
WHERE
|
81
|
WHERE
|
|
75
|
s.isopen_dc = 1
|
82
|
s.isopen_dc = 1
|
|
76
|
AND ".$where." GROUP BY s.id order by s.scale".$limit);
|
83
|
AND ".$where." GROUP BY s.id order by s.scale".$limit);
|
