diff --git a/app/api/controller/ContractController.php b/app/api/controller/ContractController.php index 844ab93bd..913e7d79c 100644 --- a/app/api/controller/ContractController.php +++ b/app/api/controller/ContractController.php @@ -24,6 +24,7 @@ class ContractController extends BaseApiController } else { $query = Contract::where("type",1)->where('party_b',$this->userInfo['company_id']); } + $query->where('status',1); $count = $query->count(); $contract = $query->with(['party_a_info','party_b_info','contract_type'])->page($page)->limit($limit)->select(); // ->each(function ($item, $key) { diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 0e266d882..ab58f0f8c 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -97,14 +97,20 @@ class IndexController extends BaseApiController if($a){ $find=Db::name('contract')->where('id',$a['id'])->find(); if($find){ - Db::name('contract')->where('id',$a['id'])->update(['status'=>1]); - if($find['type']==1){ - Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); - Db::name('company')->where('id',$find['party_b'])->update(['status'=>1,'is_contract'=>1]); - }else{ - Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); - Db::name('user')->where('id',$find['party_b'])->update(['is_contract'=>1]); + if($find['signing_timer']==0){ + Db::name('contract')->where('id',$a['id'])->update(['signing_timer'=>1]); + return true; + }else if($find['signing_timer']==1){ + Db::name('contract')->where('id',$a['id'])->update(['status'=>1,'signing_timer'=>2]); + if($find['type']==1){ + Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); + Db::name('company')->where('id',$find['party_b'])->update(['status'=>1,'is_contract'=>1]); + }else{ + Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); + Db::name('user')->where('id',$find['party_b'])->update(['is_contract'=>1]); + } } + } } 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