|
@@ -58,7 +58,7 @@ class Guild extends Api
|
|
|
$idcardfind = \app\common\model\GuildJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
|
|
|
if($idcardfind) $this->error("您存在加入公会的申请,正在审核中,请耐心等待!");
|
|
|
|
|
|
- $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1,"sign_time"=>["gt",time()]])->find();
|
|
|
+ $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1])->find();
|
|
|
if($memberfind) $guild_id = $memberfind->guild_id;
|
|
|
|
|
|
if(!$guild_id) {
|
|
@@ -123,7 +123,7 @@ class Guild extends Api
|
|
|
$idcardfind = \app\common\model\GuildJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
|
|
|
if($idcardfind) $this->error("您存在加入公会的申请,正在审核中,请耐心等待!");
|
|
|
|
|
|
- $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1,"sign_time"=>["gt",time()]])->find();
|
|
|
+ $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1])->find();
|
|
|
if($memberfind) $guild_id = $memberfind->guild_id;
|
|
|
|
|
|
$guildWhere['user_id'] = $user_id;
|
|
@@ -259,7 +259,7 @@ class Guild extends Api
|
|
|
'user_id' => $user_id,
|
|
|
'role' => 2,
|
|
|
|
|
|
- 'sign_time' => 0,
|
|
|
+
|
|
|
'status' => 1,
|
|
|
'createtime' => time(),
|
|
|
];
|
|
@@ -427,7 +427,7 @@ class Guild extends Api
|
|
|
$data["user_id"] = $joininInfo->user_id;
|
|
|
$data["role"] = 0;
|
|
|
|
|
|
- $data["sign_time"] = $endtime;
|
|
|
+
|
|
|
$data["status"] = 1;
|
|
|
$data["createtime"] = time();
|
|
|
$res3 = \app\common\model\GuildMember::insert($data);
|
|
@@ -843,7 +843,7 @@ class Guild extends Api
|
|
|
$joinInfo = \app\common\model\GuildJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
|
|
|
if($joinInfo) $this->error("您存在申请加入公会信息,请联系工会长处理完毕后方可申请开厅!");
|
|
|
|
|
|
- $memberInfo = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1,"sign_time"=>["gt",time()]])->find();
|
|
|
+ $memberInfo = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1])->find();
|
|
|
if($memberInfo) $this->error("您已存在签约中的公会,无法开新厅!");
|
|
|
|
|
|
|
|
@@ -896,7 +896,7 @@ class Guild extends Api
|
|
|
$joinStatus = \app\common\model\GuildJoinin::where(["user_id"=>$user_id])->value("status");
|
|
|
if($joinStatus === 0) $guildInfo["status"] = 1;
|
|
|
|
|
|
- $Member = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1,"sign_time"=>["gt",time()]])->value("id");
|
|
|
+ $Member = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1])->value("id");
|
|
|
if($Member > 0) $guildInfo["status"] = 2;
|
|
|
|
|
|
$this->success("获取成功!",$guildInfo);
|