修改店铺编辑

app/Http/Controllers/Admin/Business.php

@@ -247,30 +247,43 @@ class Business extends Auth{
             if ($data['city_ids']){
                 $data['city_ids']		= implode(',',$data['city_ids']);
             }
-			// 写入数据表
-			$result					= $Model->edit($id,$data);
-			// 如果操作失败
-			if( !$result ) 			return json_send(['code'=>'error','msg'=>'新增失败']);
-            $userData['username']	= $custom_name;
-            $userData['phone']		= $phone;
-            if ($custom_password){
-                $userData['password']	= md5($custom_password);
-            }
-            //获取店铺信息
-            $info                   = $Model->getOne($id);
-            //获取用户信息
-            $userInfo               = $AdminUser->getOne($info['admin_uid']);
-            // 写入数据表
-            if (!$userInfo){
-                $result					= $AdminUser->add($userData);
-                if( !$result ) 			return json_send(['code'=>'error','msg'=>'新增失败']);
-                $result					= $Model->edit($id,['admin_uid'=>$result['admin_uid']]);
+            //事务
+            DB::beginTransaction();
+            try {
+                // 写入数据表
+                $result					= $Model->edit($id,$data);
+                // 如果操作失败
                 if( !$result ) 			return json_send(['code'=>'error','msg'=>'新增失败']);
-            }else{
-                $result					= $AdminUser->edit($info['admin_uid'],$userData);
+                $userData['username']	= $custom_name;
+                $userData['phone']		= $phone;
+                if ($custom_password){
+                    $userData['password']	= md5($custom_password);
+                }
+                //获取用户信息
+                $userInfo               = $AdminUser->getOne($oldData['admin_uid']);
+                // 写入数据表
+                if (!$userInfo){
+                    $result					= $AdminUser->add($userData);
+                    if( !$result ){
+                        DB::rollBack();
+                        return json_send(['code'=>'error','msg'=>'编辑失败']);
+                    }
+                    $result					= $Model->edit($id,['admin_uid'=>$result['admin_uid']]);
+                    if( !$result ){
+                        DB::rollBack();
+                        return json_send(['code'=>'error','msg'=>'编辑失败']);
+                    }
+                }else{
+                    $result					= $AdminUser->edit($oldData['admin_uid'],$userData);
+                    if( !$result ){
+                        DB::rollBack();
+                        return json_send(['code'=>'error','msg'=>'编辑失败']);
+                    }
+                }
+            }catch (\Exception $e){
+                DB::rollBack();
+                return				json_send(['code'=>'error','msg'=>'编辑失败','data'=>json_encode($e->getMessage())]);
             }
-            // 如果操作失败
-            if( !$result ) 			return json_send(['code'=>'error','msg'=>'新增失败']);
 			// 记录行为
 			$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,$oldData,$data);
 			// 告知结果