dever 3 年之前
父节点
当前提交
60af6b1366
共有 3 个文件被更改,包括 6 次插入2 次删除
  1. 1 1
      app/shop/database/info.php
  2. 1 1
      app/shop/lib/Info.php
  3. 4 0
      app/shop/lib/Sell.php

+ 1 - 1
app/shop/database/info.php

@@ -633,7 +633,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'one',
-            'col' => 'id,name,`desc`,truename,mobile,lng,lat,address,open,worktime,method,gotime,city,area,province,county,town,coupon_city,pdesc,license,food_license,jy_license,license_number,company_name',
+            'col' => 'id,name,`desc`,ps_cash,truename,mobile,lng,lat,address,open,worktime,method,gotime,city,area,province,county,town,coupon_city,pdesc,license,food_license,jy_license,license_number,company_name',
         ),
     ),
 );

+ 1 - 1
app/shop/lib/Info.php

@@ -212,7 +212,7 @@ class Info
         }
         
         if ($lng && $lat) {
-            $sql = 'select id,name,`desc`,truename,mobile,lng,lat,address,open,worktime,method,gotime,city,area,province,county,town,coupon_city,pdesc,license,food_license,jy_license,license_number,company_name,round((st_distance(point(lng, lat), point('.$lng.', '.$lat.'))*111195)/1000, 2) as distance from {table} where '.$where.' order by distance asc';
+            $sql = 'select id,name,`desc`,ps_cash,truename,mobile,lng,lat,address,open,worktime,method,gotime,city,area,province,county,town,coupon_city,pdesc,license,food_license,jy_license,license_number,company_name,round((st_distance(point(lng, lat), point('.$lng.', '.$lat.'))*111195)/1000, 2) as distance from {table} where '.$where.' order by distance asc';
 
             $data = Dever::db('shop/info')->$method($sql, array(), $page);
         } else {

+ 4 - 0
app/shop/lib/Sell.php

@@ -613,6 +613,10 @@ class Sell
 
         $data['name'] = implode(',', $data['name']);
 
+        if ($data['method'] == 2) {
+            $data['ps_cash'] = $data['shop']['ps_cash'];
+        }
+
         return $data;
     }