From 20557acb987b27295b19ffb92df0acb7cbe5c879 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 4 Sep 2023 16:42:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/CeshiController.php | 14 +++++++-------
 app/job/TaskInformationJob.php         |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php
index 5ce89b2fe..26666a30b 100644
--- a/app/api/controller/CeshiController.php
+++ b/app/api/controller/CeshiController.php
@@ -42,15 +42,15 @@ class CeshiController extends BaseApiController
 
         //     TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
         // }
-        // $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
-        // foreach($all as $k=>$v){
-        //     queue(TaskInformationJob::class,$v);
-        // }
-// return true;
-        $plan_all = TaskScheduling::where('id',99)->with('company_info')->select()->toArray();
+        $all=TaskSchedulingPlan::where('id',893)->with(['template_info','scheduling'])->select()->toArray();
+        foreach($all as $k=>$v){
+            queue(TaskInformationJob::class,$v);
+        }
+return true;
+        $plan_all = TaskScheduling::where('id',119)->with('company_info')->select()->toArray();
         $plan_ids = [];
         foreach ($plan_all as $k => $v) {
-            $all = TaskTemplate::where('id', 109)->where('task_scheduling', $v['id'])->limit(30)->select()->toArray();
+            $all = TaskTemplate::where('id', 118)->where('task_scheduling', $v['id'])->limit(30)->select()->toArray();
             $plan_ids[] = $v['id'];
             if ($all) {
                 $plan_all[$k]['template'] = $all;
diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php
index 6f9978c6a..5727ea457 100644
--- a/app/job/TaskInformationJob.php
+++ b/app/job/TaskInformationJob.php
@@ -10,6 +10,7 @@ use think\facade\Log;
 use app\common\model\Company;
 use app\common\model\task_scheduling_plan\TaskSchedulingPlan;
 use app\common\model\task_template\TaskTemplate;
+use think\facade\Db;
 
 /**
  * 任务结算执行的具体逻辑
@@ -22,6 +23,7 @@ class TaskInformationJob
         // if ($job->attempts() > 1) {
         //     //通过这个方法可以检查这个任务已经重试了几次了
         // }
+        Db::startTrans();
         try {
             TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]);
             $company = Company::where('id', $data['company_id'])->field('id,deposit,responsible_area,company_money,shareholder_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
@@ -42,7 +44,7 @@ class TaskInformationJob
             } elseif
             //交易金额
             ($data['template_info']['type'] == 33) {
-                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,2);
+                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company);
                 if ($shang_date_total_price == false) {
                     Log::info('交易金额任务，交易金额未达到要求：' . json_encode($data));
                     Task::where('id', $data['task_id'])->update(['status' => 5]);
@@ -129,7 +131,9 @@ class TaskInformationJob
             // $arr['proportion_two'] = $data['template_info']['proportion_two'];
             $arr['sn'] = $data['sn'];
             $arr['id'] = $data['id'];
+            Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             Log::error('line:'.$e->getLine().'异常报错：任务结算失败：' . $data['template_info']['title'] . $e->getMessage() . json_encode($data));
             return false;
         }