mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'mkm' (#3) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/3
This commit is contained in:
mkm 2023-08-02 10:51:28 +08:00
commit e8113ba91b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/contract/ContractController.php
View File

@ -112,7 +112,7 @@ class ContractController extends BaseAdminController
{ {
$params = Request::param(); $params = Request::param();
$file = $params['file']; $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) { if ($res) {
return $this->success('上传成功', [], 1, 1); return $this->success('上传成功', [], 1, 1);
} else { } else {

2
app/adminapi/controller/user/UserController.php
View File

@ -94,6 +94,7 @@ class UserController extends BaseAdminController
if($params['party_a']<=0){ if($params['party_a']<=0){
return $this->fail('甲方不存在,请联系平台绑定公司'); return $this->fail('甲方不存在,请联系平台绑定公司');
} }
$params['check_status']=1;
$res=Contract::Initiate_contract($params); $res=Contract::Initiate_contract($params);
if (true === $res) { if (true === $res) {
return $this->success('发起成功，等待平台风控部上传合同'); return $this->success('发起成功，等待平台风控部上传合同');
@ -105,7 +106,6 @@ class UserController extends BaseAdminController
{ {
$params = Request::param(); $params = Request::param();
$result = UserLogic::detail($params['id']); $result = UserLogic::detail($params['id']);
halt($result);
if ($result && $result['contract'] && $result['contract']['file'] != '') { if ($result && $result['contract'] && $result['contract']['file'] != '') {
$data = [ $data = [
'name' => $result['nickname'] . '的合同', 'name' => $result['nickname'] . '的合同',

2
app/api/logic/UserLogic.php
View File

@ -74,7 +74,7 @@ class UserLogic extends BaseLogic
public static function info(int $userId) public static function info(int $userId)
{ {
$user = User::where(['id' => $userId])->with(['admin','company']) $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(); ->findOrEmpty();
// $user['avatar'] = $user['avatar'] ? Request()->host() . $user['avatar'] : $user['avatar']; // $user['avatar'] = $user['avatar'] ? Request()->host() . $user['avatar'] : $user['avatar'];
$user['has_password'] = !empty($user['password']); $user['has_password'] = !empty($user['password']);

2
vendor/ebaoquan/junziqian_sdk vendored

@ -1 +1 @@
Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74 Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049