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

更新

Browse Source
This commit is contained in:
mkm 2023-08-26 16:25:44 +08:00
parent 7664076b2d
commit 70fe33107b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,12 @@ class UserController extends BaseAdminController
//**发起合同 */ //**发起合同 */
public function initiate_contract(){ public function initiate_contract(){
$params = Request::param(); $params = Request::param();
$params['party_a']=Db::name('company')->where('admin_id',$this->adminId)->value('id'); $find=Db::name('company')->where('admin_id',$this->adminId)->field('id,area_manager')->find();
if($params['party_a']<=0){ if(!$find||$find['party_a']<=0){
return $this->fail('甲方不存在,请联系平台绑定公司'); return $this->fail('甲方不存在,请联系平台绑定公司');
} }
$params['check_status']=1; $params['check_status']=1;
$params['area_manager'] = $find['area_manager'];
$res=ContractLogic::Initiate_contract($params); $res=ContractLogic::Initiate_contract($params);
if (true === $res) { if (true === $res) {
return $this->success('发起成功，等待平台风控部上传合同', [], 1, 1); return $this->success('发起成功，等待平台风控部上传合同', [], 1, 1);

2
app/api/controller/CompanyController.php
View File

@ -155,6 +155,8 @@ class CompanyController extends BaseApiController
{ {
$params = $this->request->param(); $params = $this->request->param();
$params['party_a'] = $this->userInfo['company_id']; $params['party_a'] = $this->userInfo['company_id'];
$area_manager = Company::where('id', $params['party_a'])->value('area_manager');
$params['area_manager'] = $area_manager;
$params['type'] = 1; $params['type'] = 1;
$result = ContractLogic::initiate_contract($params); $result = ContractLogic::initiate_contract($params);
if ($result == true) { if ($result == true) {

4
app/job/TaskInformationJob.php
View File

@ -80,13 +80,13 @@ class TaskInformationJob
$arr['sn'] = $data['sn']; $arr['sn'] = $data['sn'];
$arr['id'] = $data['id']; $arr['id'] = $data['id'];
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('列122 任务结算失败：' . $data['template_info']['title'] . $e->getMessage() . json_encode($data)); Log::info('列122 任务结算失败：' . $data['template_info']['title'] . $e->getMessage() . json_encode($data));
return false; return false;
} }
if ($arr['status'] == 1) { if ($arr['status'] == 1) {
(new ShareProfit())->first($arr, $company); (new ShareProfit())->first($arr, $company);
} else { } else {
Log::error('任务结算失败：' . $data['template_info']['title'] . '未完成' . json_encode($data)); Log::info('任务结算失败：' . $data['template_info']['title'] . '未完成' . json_encode($data));
} }
//如果任务执行成功后 记得删除任务，不然这个任务会重复执行，直到达到最大重试次数后失败后，执行failed方法 //如果任务执行成功后 记得删除任务，不然这个任务会重复执行，直到达到最大重试次数后失败后，执行failed方法
$job->delete(); $job->delete();

1
composer.json
View File

@ -34,7 +34,6 @@
"alibabacloud/client": "^1.5", "alibabacloud/client": "^1.5",
"rmccue/requests": "^2.0", "rmccue/requests": "^2.0",
"w7corp/easywechat": "^6.8", "w7corp/easywechat": "^6.8",
"ebaoquan/junziqian_sdk":">=2.0.2",
"yunwuxin/think-cron": "^3.0", "yunwuxin/think-cron": "^3.0",
"topthink/think-queue": "^3.0" "topthink/think-queue": "^3.0"
}, },