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

View File

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

View File

@ -155,6 +155,8 @@ class CompanyController extends BaseApiController
{
$params = $this->request->param();
$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;
$result = ContractLogic::initiate_contract($params);
if ($result == true) {

View File

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

View File

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