Browse Source

提现限制

Kirin 1 year ago
parent
commit
0d5831239f

+ 3 - 2
app/api/controller/PublicController.php

@@ -290,14 +290,15 @@ class PublicController
      */
     public function store_list(Request $request)
     {
-        list($latitude, $longitude, $page, $limit, $cid) = UtilService::getMore([
+        list($keyword, $latitude, $longitude, $page, $limit, $cid) = UtilService::getMore([
             ['latitude', ''],
             ['longitude', ''],
             ['page', 1],
             ['limit', 10],
+            ['keyword', ''],
             ['cid', '']
         ], $request, true);
-        $list = SystemStore::lst($latitude, $longitude, $page, $limit, $cid);
+        $list = SystemStore::lst($keyword, $latitude, $longitude, $page, $limit, $cid);
         if (!$list) $list = [];
         $data['list'] = $list;
         $data['tengxun_map_key'] = sys_config('tengxun_map_key');

+ 1 - 1
app/models/store/StoreOrder.php

@@ -303,7 +303,7 @@ class StoreOrder extends BaseModel
                     if (empty($addressInfo['longitude']) || empty($addressInfo['latitude'])) {
                         return self::setErrorInfo('收货地址经纬度不能为空!', true);
                     }
-                    $rs = SystemStore::lst($addressInfo['latitude'], $addressInfo['longitude'], 1, 1);
+                    $rs = SystemStore::lst('', $addressInfo['latitude'], $addressInfo['longitude'], 1, 1);
                     if (!$rs) {
                         return self::setErrorInfo('系统没设置门店!', true);
                     }

+ 4 - 1
app/models/system/SystemStore.php

@@ -85,7 +85,7 @@ class SystemStore extends BaseModel
      * 门店列表
      * @return mixed
      */
-    public static function lst($latitude, $longitude, $page, $limit, $cid = '')
+    public static function lst($keyword, $latitude, $longitude, $page, $limit, $cid = '')
     {
         $model = new self();
         $model = $model->where('is_del', 0);
@@ -99,6 +99,9 @@ class SystemStore extends BaseModel
                 }
             });
         }
+        if ($keyword != '') {
+            $model = $model->where('name|address|detailed_address|phone', 'like', "%{$keyword}%");
+        }
 //        $model = $model->where('is_triple', 0);
         if ($latitude && $longitude) {
             $model = $model->field(['*', self::distanceSql($latitude, $longitude)])->order('distance asc');