Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

app/Http/Controllers/Api/MobileWeb/LoginController.php

@@ -55,11 +55,8 @@ class LoginController extends Controller
         if ($error_message) {
             return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'data'=>[]]);
         }
+        $return_data = LoginService::getOpenid($request->all(),$request->ip());
 
-        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxf457f42f874c3545&secret=62c5530f13e8b88204818c8b98d3a5b6&code=".$request->input('code')."&grant_type=authorization_code";
-        $result = CommonService::requestGet($url);
-        $jsoninfo = json_decode($result, true);
-        $openid = $jsoninfo["openid"];
         return $return_data;
     }
 }

app/Http/Controllers/Api/MobileWeb/TechnicianController.php

@@ -87,4 +87,16 @@ class TechnicianController extends Controller
         $return_data = TechnicianService::delete($request->all(),$request->ip());
         return response()->json($return_data);
     }
+
+    //上传图片
+    public function addHeadPic ( Request $request ){
+        // 验证数据
+        $error_message = $this->dataValidator->addHeadPicValidator($request->all());
+        if ($error_message) {
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
+        }
+
+        $return_data = TechnicianService::addHeadPic($request->all(),$request->ip());
+        return response()->json($return_data);
+    }
 }

app/Http/Requests/Validators/Api/MobileWeb/TechnicianValidator.php

@@ -144,6 +144,24 @@ class TechnicianValidator extends FormRequest
             'admin_id' => 'required|integer|min:1',
         ], $messages);
 
+        // 判断数据验证是否成功
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+    }
+    // 添加头像
+    public function addHeadPicValidator($data)
+    {
+        // 自定义错误消息
+        $messages = [
+            'file.required' => '请上传图片',
+        ];
+
+        // 数据验证
+        $validator = Validator::make($data, [
+            'file' => 'required|string',
+        ], $messages);
+
         // 判断数据验证是否成功
         if ($validator->fails()) {
             return $validator->errors();

app/Services/Api/MobileWeb/LoginService.php

@@ -23,7 +23,7 @@ class LoginService
                 ->where('delet_y', 1)
                 ->where('check_code', $request['account'])
                 ->where('install_password', md5($request['password']))
-                ->select('install.id', 'check_code', 'install_name', 'install_phone', 'install_is_type', 'admin_id','company_id','admin_groupnew')
+                ->select('install.id', 'check_code', 'install_name', 'install_phone', 'install_is_type', 'admin_id','adm.company_id','admin_groupnew')
                 ->first();
         } elseif($request['user_type'] == 2) { //服务商登录
             //判定是否有公司名称字段
@@ -263,4 +263,22 @@ class LoginService
             }
         }
     }
+    /**|---------------------------------------------------------------------------------
+     * @name 获取openid
+     * @param string code 微信授权码
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/9/13 17:07
+     * |---------------------------------------------------------------------------------
+    */
+    public static function getOpenid ( $request ){
+        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxf457f42f874c3545&secret=62c5530f13e8b88204818c8b98d3a5b6&code=".$request['code']."&grant_type=authorization_code";
+        $result = CommonService::requestGet($url);
+        $jsoninfo = json_decode($result, true);
+        if(isset($jsoninfo["openid"])){
+            return ["ErrorCode" => 1, 'ErrorMessage' => '操作成功', 'data' => $jsoninfo["openid"]];
+        }else{
+            return ["ErrorCode" => ErrorInc::SAPI_FAILED, 'ErrorMessage' => '操作失败', 'data' => $jsoninfo];
+        }
+        $openid = $jsoninfo["openid"];
+    }
 }

app/Services/Api/MobileWeb/OrderListService.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\DB;
 use BlueCity\Core\Inc\ErrorInc;
 use App\Models\{Admin,
+    Company,
     Feedback,
     GhPrice,
     GoodsBrand,
@@ -40,7 +41,7 @@ class OrderListService extends Model
         $where['ser_id'] =$session['admin_id'];//服务商id
         $where['is_delete'] =1;//是否删除:1正常2删除
         if (!empty($session['install_id']) && $session['user_type'] == 1) {
-            $where['intall_id'] =$session['install_id'];//技师id
+            $where['install_id'] =$session['install_id'];//技师id
         }
         if (!empty($request['stauas'])) {
             if($request['stauas'] == 1){
@@ -220,6 +221,10 @@ class OrderListService extends Model
         $stauas_count[] = ['count'=>$azz_num,'stauas'=>3];
         $stauas_count[] = ['count'=>$ywc_num,'stauas'=>4];
         $data['stauas_count'] = $stauas_count;
+
+        if(in_array($request['stauas'], [1,2]) && $session['user_type'] == 1){
+            return ['ErrorCode' => 1, 'ErrorMessage' => '暂无数据', 'Data' => $data];
+        }
         if ($data['list']) {
             return ['ErrorCode' => 1, 'ErrorMessage' => '成功', 'Data' => $data];
         } else {
@@ -762,6 +767,7 @@ class OrderListService extends Model
             $data['shr_xian'] = $user['shr_xian'];
             $data['install_id'] = $orderListArr['install_id'];
             $data['shr_adress'] = $user['shr_adress'];
+            $data['company_name'] = Company::where("com_id",$orderListArr['company_id'])->value('com_name');//订单id
             if($orderListArr['stauas']>20){
                 $data['goods_price'] = SettlementMoney::where('sem_synum',$orderListArr['sys_num'])->where('sem_type',1)->sum('sem_price');
             }else{
@@ -835,7 +841,6 @@ class OrderListService extends Model
             $data['feedback']['type_name5'] = self::getPicName(5);
             $data['feedback']['feedback_pic6'] = '';
             $data['feedback']['type_name6'] = self::getPicName(6);
-            if(in_array($orderListArr['stauas'],[34,40])){
             $feedback = Feedback::where('gl_id',$orderListArr['id'])
                 ->where('is_delect',1)
                 ->select('type','type_name','feedback_pic')
@@ -873,7 +878,6 @@ class OrderListService extends Model
                     }
                 }
             }
-            }
             return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => $data];
         }else{
             return ['ErrorCode' => ErrorInc::DATA_EMPTY, 'ErrorMessage' => '未查询到订单', 'Data' => []];

app/Services/Api/MobileWeb/TechnicianService.php

@@ -3,6 +3,7 @@
 namespace App\Services\Api\MobileWeb;
 
 use App\Services\CommonService;
+use App\Services\DealPicService;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Redis;
@@ -331,4 +332,21 @@ class TechnicianService
             return ['ErrorCode'=>500, 'ErrorMessage'=>'失败', 'Data'=>[]];
         }
     }
+    /**|---------------------------------------------------------------------------------
+     * @name 添加头像
+     * @param string file 图片base64
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/9/13 18:47
+     * |---------------------------------------------------------------------------------
+    */
+    public static function addHeadPic ( $request ){
+        $request['path']='./InstallHeadPic/'.date('Ym');
+        $rea = DealPicService::addPic($request['file'],$request['path'],1);
+        if($rea){
+            $rea = OrderListService::picurl($rea);
+            return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => $rea];
+        }else{
+            return ['ErrorCode' => ErrorInc::DATA_EMPTY, 'ErrorMessage' => '操作失败', 'Data' => $rea];
+        }
+    }
 }

routes/api.php

@@ -1450,6 +1450,7 @@ Route::namespace('Api')->group(function () {
         Route::post('w1/Technician/changePassword', 'MobileWeb\TechnicianController@changePassword'); //技师列表-修改密码
         Route::post('w1/Technician/delete', 'MobileWeb\TechnicianController@delete'); //删除
         Route::post('w1/Technician/edit', 'MobileWeb\TechnicianController@edit'); //编辑
+        Route::post('w1/Technician/addHeadPic', 'MobileWeb\TechnicianController@addHeadPic'); //添加头像图片
 
         // 账单模块
         Route::post('w1/BillingModule/index', 'MobileWeb\BillingModuleController@index'); //列表