diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php index 7417b9f86..76a74e99c 100644 --- a/app/adminapi/controller/contract/ContractController.php +++ b/app/adminapi/controller/contract/ContractController.php @@ -112,7 +112,7 @@ class ContractController extends BaseAdminController { $params = Request::param(); $file = $params['file']; - $res = Contract::where('id', $params['id'])->update(['file' => $file]); + $res = Contract::where('id', $params['id'])->update(['file' => $file,'check_status'=>2]); if ($res) { return $this->success('上传成功', [], 1, 1); } else { diff --git a/app/adminapi/controller/user/UserController.php b/app/adminapi/controller/user/UserController.php index e835688ff..723e23873 100755 --- a/app/adminapi/controller/user/UserController.php +++ b/app/adminapi/controller/user/UserController.php @@ -94,6 +94,7 @@ class UserController extends BaseAdminController if($params['party_a']<=0){ return $this->fail('甲方不存在,请联系平台绑定公司'); } + $params['check_status']=1; $res=Contract::Initiate_contract($params); if (true === $res) { return $this->success('发起成功,等待平台风控部上传合同'); @@ -105,7 +106,6 @@ class UserController extends BaseAdminController { $params = Request::param(); $result = UserLogic::detail($params['id']); - halt($result); if ($result && $result['contract'] && $result['contract']['file'] != '') { $data = [ 'name' => $result['nickname'] . '的合同', diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php index fef84a44e..735382577 100755 --- a/app/api/logic/UserLogic.php +++ b/app/api/logic/UserLogic.php @@ -74,7 +74,7 @@ class UserLogic extends BaseLogic public static function info(int $userId) { $user = User::where(['id' => $userId])->with(['admin','company']) - ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money,income,admin_id,company_id') + ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money,income,admin_id,company_id,is_captain') ->findOrEmpty(); // $user['avatar'] = $user['avatar'] ? Request()->host() . $user['avatar'] : $user['avatar']; $user['has_password'] = !empty($user['password']); diff --git a/vendor/ebaoquan/junziqian_sdk b/vendor/ebaoquan/junziqian_sdk index 1294ea49f..9acc82cd2 160000 --- a/vendor/ebaoquan/junziqian_sdk +++ b/vendor/ebaoquan/junziqian_sdk @@ -1 +1 @@ -Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74 +Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049