chenqp 8 hónapja
szülő
commit
e261541e0d

+ 1 - 3
app/Http/Controllers/Api/WxController.php

@@ -113,9 +113,7 @@ class WxController extends BaseController
         if ($status) {
             return $this->json_return(200, '', $data);
         } else {
-            $code = 202;
-            if($status == 0) $code = 201;
-            return $this->json_return($code, $data);
+            return $this->json_return(202, $data);
         }
     }
 }

+ 1 - 1
app/Http/Middleware/CheckWx.php

@@ -37,7 +37,7 @@ class CheckWx
                 ->where('state',Employee::USE)
                 ->select('id')
                 ->first();
-            if(empty($emp)) return response()->json(['code'=> 201,'msg'=>'用户手机信息未匹配到系统账号,请录入手机号!','data'=>null]);
+            if(empty($emp)) return response()->json(['code'=> 202,'msg'=>'用户手机信息未匹配到系统账号,请录入手机号!','data'=>null]);
             $emp = $emp->toArray();
             WxEmployee::where('id',$employee['id'])->update(['employee_id' => $emp['id']]);
             $employee['employee_id'] = $emp['id'];

+ 5 - 0
app/Service/ProductService.php

@@ -641,6 +641,11 @@ class ProductService extends Service
             ->orderby('product_attribute', 'desc')
             ->orderby('id', 'desc');
 
+        if(! empty($data['title_t'])) {
+            $model->where('title', 'LIKE', '%'.$data['title_t'].'%')
+                ->orWhere('code', 'LIKE', '%'.$data['title_t'].'%')
+                ->orWhere('size', 'LIKE', '%'.$data['title_t'].'%');
+        }
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
         if(isset($data['state'])) $model->where('state', $data['state']);
         if(isset($data['product_attribute'])) $model->where('product_attribute', $data['product_attribute']);

+ 9 - 1
app/Service/Wx/WxEmployeeService.php

@@ -39,7 +39,15 @@ class WxEmployeeService extends Service
             $state = 0;
         }else{
             $state = 1;
-            if(empty($user->mobile)) $state = 0;
+            if(empty($user->mobile)){
+                $state = 0;
+            }else{
+                $bool = Employee::where('del_time',0)
+                    ->where('mobile',$user->mobile)
+                    ->where('state',Employee::USE)
+                    ->exists();
+                if(! $bool) $state = 0;
+            }
         }
 
         return [true,['openid'=>$openid, 'state'=> $state]];