From 70fe33107b0b479d698e582816062cde4548235d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 26 Aug 2023 16:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/user/UserController.php | 5 +++--
 app/api/controller/CompanyController.php        | 2 ++
 app/job/TaskInformationJob.php                  | 4 ++--
 composer.json                                   | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/controller/user/UserController.php b/app/adminapi/controller/user/UserController.php
index 0c9c61a4d..aa5e04ba6 100755
--- a/app/adminapi/controller/user/UserController.php
+++ b/app/adminapi/controller/user/UserController.php
@@ -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);
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 278f27fc2..da477fbf3 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -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) {
diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php
index 3f7b748c1..99ece3f64 100644
--- a/app/job/TaskInformationJob.php
+++ b/app/job/TaskInformationJob.php
@@ -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();
diff --git a/composer.json b/composer.json
index d554bc9eb..c28a89fcc 100755
--- a/composer.json
+++ b/composer.json
@@ -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"
     },