Merge branch 'dev' into dev-sxb

app/controller/api/store/merchant/Taskordervr.php

@@ -69,6 +69,22 @@ class Taskordervr extends BaseController
             return json(['code'=>400,'msg'=>'获取用户失败,请重试!']);
         }
 
+        // 不同0号线团队之间 禁止转VR
+        $userZeroLineList = Db::name('user_zero_line')->where('status', '=', 1)->select()->toArray();
+        foreach ($userZeroLineList as $userZeroLine) {
+            //查询当前团队的用户列表
+            $sql = "select getUserLevelId({$userZeroLine['team_uid']}) as uids";
+            //\think\facade\Log::info("lplpDB".$sql);
+            try {
+                $spread_user_list = Db::query($sql);
+            } catch (\Exception $exception) {
+                return json($exception->getMessage());
+            }
+            $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
+            if (in_array($uid, $spread_user_list) !== in_array($user_data['uid'], $spread_user_list)) {
+                return json(['code' => 400, 'msg' => '不同团队之间禁止互转VR!', 'data' => '']);
+            }
+        }
 
 
         if($user_data['uid'] == $udatas['uid']){