wesmiler 2 weeks ago
parent
commit
7e8aebba6f
1 changed files with 8 additions and 13 deletions
  1. 8 13
      app/Services/Common/StoreService.php

+ 8 - 13
app/Services/Common/StoreService.php

@@ -18,7 +18,7 @@ use App\Services\BaseService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
- * 企业店铺管理-服务类
+ * 商户店铺管理-服务类
  * @author laravel开发员
  * @author laravel开发员
  * @since 2020/11/11
  * @since 2020/11/11
  * @package App\Services\Common
  * @package App\Services\Common
@@ -57,11 +57,11 @@ class StoreService extends BaseService
 
 
                 // 名称搜索
                 // 名称搜索
                 if (isset($params['name']) && $params['name']) {
                 if (isset($params['name']) && $params['name']) {
-                    $query->where('nickname', 'like', "%{$params['name']}%");
+                    $query->where('name', 'like', "%{$params['name']}%");
                 }
                 }
                 // 联系电话搜索
                 // 联系电话搜索
-                if (isset($params['phone']) && $params['phone']) {
-                    $query->where('phone', 'like', "%{$params['phone']}%");
+                if (isset($params['mobile']) && $params['mobile']) {
+                    $query->where('mobile', 'like', "%{$params['mobile']}%");
                 }
                 }
                 // 姓名搜索
                 // 姓名搜索
                 if (isset($params['real_name']) && $params['real_name']) {
                 if (isset($params['real_name']) && $params['real_name']) {
@@ -79,11 +79,6 @@ class StoreService extends BaseService
             foreach ($list['data'] as &$item) {
             foreach ($list['data'] as &$item) {
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
                 $item['status_text'] = $this->getStatusText($item['status']);
                 $item['status_text'] = $this->getStatusText($item['status']);
-                // 处理门头照图片
-                if (isset($item['avatar']) && $item['avatar']) {
-                    $item['avatar'] = get_image_url($item['avatar']);
-                }
-
                 // 添加余额信息
                 // 添加余额信息
                 $item['balance'] = isset($item['member']['balance']) ? $item['member']['balance'] : 0;
                 $item['balance'] = isset($item['member']['balance']) ? $item['member']['balance'] : 0;
                 $item['password'] = '';
                 $item['password'] = '';
@@ -135,13 +130,13 @@ class StoreService extends BaseService
             // 店铺名称搜索
             // 店铺名称搜索
             $name = isset($params['name']) ? trim($params['name']) : '';
             $name = isset($params['name']) ? trim($params['name']) : '';
             if ($name) {
             if ($name) {
-                $query->where('nickname', 'like', "%{$name}%");
+                $query->where('name', 'like', "%{$name}%");
             }
             }
 
 
             // 联系电话搜索
             // 联系电话搜索
             $phone = isset($params['phone']) ? trim($params['phone']) : '';
             $phone = isset($params['phone']) ? trim($params['phone']) : '';
             if ($phone) {
             if ($phone) {
-                $query->where('phone', 'like', "%{$phone}%");
+                $query->where('mobile', 'like', "%{$phone}%");
             }
             }
 
 
             // 姓名搜索
             // 姓名搜索
@@ -212,7 +207,6 @@ class StoreService extends BaseService
             return  message('请填写商户负责人姓名', false);
             return  message('请填写商户负责人姓名', false);
         }
         }
 
 
-
         // 手机号唯一性验证
         // 手机号唯一性验证
         $type = isset($data['type']) && $data['type']? $data['type'] : 1;
         $type = isset($data['type']) && $data['type']? $data['type'] : 1;
         $id = isset($data['id']) ? $data['id'] : 0;
         $id = isset($data['id']) ? $data['id'] : 0;
@@ -223,6 +217,7 @@ class StoreService extends BaseService
             }
             }
         }
         }
 
 
+        var_dump($data);
         DB::beginTransaction();
         DB::beginTransaction();
         $result = parent::edit($data);
         $result = parent::edit($data);
         $success = isset($result['success'])? $result['success']:false;
         $success = isset($result['success'])? $result['success']:false;
@@ -264,7 +259,7 @@ class StoreService extends BaseService
         }
         }
 
 
         DB::commit();
         DB::commit();
-        return  message('操作成功',true);;
+        return  message('操作成功',true);
     }
     }
 
 
     /**
     /**