Commit 3478b61f4d77112f0a604167fe7f65def3603249

Authored by pengye
1 parent 18f68f30

no message

@@ -21,7 +21,7 @@ class Seller extends Common @@ -21,7 +21,7 @@ class Seller extends Common
21 $where = ''; 21 $where = '';
22 $channel = $data['channel'] ? $data['channel'] : 1; 22 $channel = $data['channel'] ? $data['channel'] : 1;
23 $version_expire = $data['version_expire']; 23 $version_expire = $data['version_expire'];
24 - 24 +
25 $online = $data['online'] ? $data['channel'] : ''; 25 $online = $data['online'] ? $data['channel'] : '';
26 26
27 27
@@ -84,39 +84,7 @@ class Seller extends Common @@ -84,39 +84,7 @@ class Seller extends Common
84 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS v ON v.sid=s.id 84 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS v ON v.sid=s.id
85 WHERE 85 WHERE
86 s.isopen_dc = 1 86 s.isopen_dc = 1
87 - AND ".$where." GROUP BY s.id order by s.scale".$limit);echo "SELECT  
88 - s.id,  
89 - s.sellername,  
90 - s.selleralias,  
91 - s.address,  
92 - s.phone,  
93 - s.map_address,  
94 - s.slogan,  
95 - s.is_online_reserve,  
96 - s.cdate,  
97 - u.user_name,  
98 - s.status,  
99 - s.last_num,  
100 - s.average,  
101 - s.score,  
102 - s.is_parking,  
103 - s.is_meal_fee,  
104 - s.is_unsubscribe,  
105 - s.is_minimum_consumption,  
106 - s.is_belt_wine,  
107 - s.scale,  
108 - s.is_auth,  
109 - scf.dz_version  
110 - FROM  
111 - `xt-member-two-LINE`.xt_seller AS s  
112 - LEFT JOIN `xt-member-two-LINE`.xt_auth_user AS u ON u.sellerid = s.id  
113 - LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid  
114 - LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id  
115 - LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id  
116 - LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS v ON v.sid=s.id  
117 - WHERE  
118 - s.isopen_dc = 1  
119 - AND ".$where." GROUP BY s.id order by s.scale".$limit;die; 87 + AND ".$where." GROUP BY s.id order by s.scale".$limit);
120 //菜系 商家类型 88 //菜系 商家类型
121 foreach ($rs as $key => $value) { 89 foreach ($rs as $key => $value) {
122 $rs[$key]['cuisine'] = Db::query("SELECT 90 $rs[$key]['cuisine'] = Db::query("SELECT