Commit 8d388ae637a164cc011857ea331ab482cf734ee3

Authored by pengye
1 parent e905f3f2

no message

@@ -31,7 +31,7 @@ class Seller extends Common @@ -31,7 +31,7 @@ class Seller extends Common
31 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : ""; 31 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
32 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : ""; 32 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
33 $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 (v.rdate-'.$versionTime[$version_expire].')<'.time():''; 34 + $where .= $version_expire ? ' and (v.edate-'.$versionTime[$version_expire].')<'.time():'';
35 switch ($data['online']) { 35 switch ($data['online']) {
36 case '1': 36 case '1':
37 $where .= ' and s.is_online_reserve = 1'; 37 $where .= ' and s.is_online_reserve = 1';
@@ -134,6 +134,7 @@ class Seller extends Common @@ -134,6 +134,7 @@ class Seller extends Common
134 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid 134 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid
135 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id 135 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
136 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id 136 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id
  137 + LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS v ON v.sid=s.id
137 WHERE 138 WHERE
138 s.isopen_dc = 1 139 s.isopen_dc = 1
139 AND ".$where." 140 AND ".$where."