From 5f1675abf4bffdbdf20724d8dbd260ccc85afbfe Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Sat, 9 Dec 2023 17:16:36 +0800 Subject: [PATCH 1/5] fixed --- app/common/logic/task/TaskLogic.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 9263b5976..92f3a597c 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -3131,6 +3131,12 @@ class TaskLogic extends BaseLogic if ($dayCount > $stageDayThreeCount) { self::finishVillageTask7($startTime, $endTime, 567, 30, $taskTemplateInfo['money_three'], $villageCompany, $taskSchedulePlan); } + + $task = Task::where('id', $taskSchedulePlan['task_id'])->find(); + // 未完成 关闭任务 + if ($task['status'] != 3) { + (new Task())->closeTask($taskSchedulePlan['task_id']); + } } /** @@ -3152,7 +3158,7 @@ class TaskLogic extends BaseLogic ]; $result = ShopRequestLogic::getPlantingAndBreedingMerchantTradeAmount($param); - + $task = Task::where('id', $taskSchedulePlan['task_id'])->find(); $tradeAmount = $result['data']['trade_amount']; Log::info(['村管理公司定时任务结算执行-种养殖基地订单匹配-交易额', $tradeAmount]); // 交易池 From 8ccaecceb9bdbc7661d7b46361661b6f3f9da67c Mon Sep 17 00:00:00 2001 From: chan <709206448@qq.com> Date: Mon, 11 Dec 2023 14:23:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=95=87=E5=90=88=E4=BC=99=E4=BA=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task_template/TaskTemplateController.php | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php index a90c397ea..070dabe1d 100644 --- a/app/adminapi/controller/task_template/TaskTemplateController.php +++ b/app/adminapi/controller/task_template/TaskTemplateController.php @@ -105,7 +105,7 @@ class TaskTemplateController extends BaseAdminController $params = (new TaskTemplateValidate())->post()->goCheck('delete'); $task = Task::where(['template_id' =>$params['id']])->whereDay('start_time', 'today')->find(); if(!empty($task)) { - $this->fail('该任务今天已在进行中，无法删除'); + return $this->fail('该任务今天已在进行中，无法删除'); } TaskTemplateLogic::delete($params); return $this->success('删除成功', [], 1, 1); @@ -140,4 +140,28 @@ class TaskTemplateController extends BaseAdminController ]; return $this->data($data); } + + public function checkRole() + { + $params = $this->request->param(); + if ($params['task_role'] == 1) { + $serviceManagerUser = (new User())->searchMaster($params['company_id']); + if (empty($serviceManagerUser)) { + return $this->fail('公司还没有负责人，无法指派任务'); + } + } + if ($params['task_role'] == 2) { + $serviceManagerUser = (new User())->searchMarketingManager($params['company_id']); + if (empty($serviceManagerUser)) { + return $this->fail('公司还没有市场部长，无法指派任务'); + } + } + + if ($params['task_role'] == 3) { + $serviceManagerUser = (new User())->searchServiceManager($params['company_id']); + if (empty($serviceManagerUser)) { + return $this->fail('公司还没有服务部长，无法指派任务'); + } + } + } } \ No newline at end of file From f77339f949a480401429bbe6ed2584843d0ee269 Mon Sep 17 00:00:00 2001 From: chan <709206448@qq.com> Date: Mon, 11 Dec 2023 15:14:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/controller/task_template/TaskTemplateController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php index 070dabe1d..b94dc0f4e 100644 --- a/app/adminapi/controller/task_template/TaskTemplateController.php +++ b/app/adminapi/controller/task_template/TaskTemplateController.php @@ -163,5 +163,6 @@ class TaskTemplateController extends BaseAdminController return $this->fail('公司还没有服务部长，无法指派任务'); } } + return $this->success('成功'); } } \ No newline at end of file From 083e39cad362fb77a3cd4e972538731527673884 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Thu, 14 Dec 2023 11:56:34 +0800 Subject: [PATCH 4/5] fixed --- app/common/logic/task_template/TaskTemplateLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php index 045805740..fa0cd380f 100644 --- a/app/common/logic/task_template/TaskTemplateLogic.php +++ b/app/common/logic/task_template/TaskTemplateLogic.php @@ -136,7 +136,7 @@ class TaskTemplateLogic extends BaseLogic Db::startTrans(); try { $company = Company::find($params['company_id']); - if ($company->company_type == 41) { + if ($company->company_type == 16) { // 创建 镇合伙人公司 任务模板 $taskScheduleAmount = 700; } else { From eecc48ad9a6f0a2ee9e2a039bc63587cb2138ea9 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Thu, 14 Dec 2023 13:34:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CeshiController.php | 73 ++++++++++++++------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php index 9e98e7260..6bcb6430f 100644 --- a/app/api/controller/CeshiController.php +++ b/app/api/controller/CeshiController.php @@ -306,12 +306,12 @@ class CeshiController extends BaseApiController $all = TaskSchedulingPlan::whereDay('end_time','today') ->withJoin(['scheduling'], 'left') ->where('scheduling.company_type', 18) - ->where('scheduling.company_id', 43) - ->where('is_pay',0) + ->where('scheduling.company_id', 34) +// ->where('is_pay',0) ->with(['template_info']) ->select() ->toArray(); - dd($all); + foreach($all as $k=>$data){ try { TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]); @@ -377,34 +377,37 @@ class CeshiController extends BaseApiController $task_35 = Task::where('id', $data['task_id'])->field('director_uid,status,money,start_time,end_time')->with('director_info')->find(); if($task_35){ $day= $data['template_info']['stage_day_one'] + $data['template_info']['stage_day_two']; - if($task_35['status']==3 && $data['template_info']['day_count']<=$day){ - $name = $task_35['director_info']['nickname']; - $arr['status'] = 1; - $arr['money'] = $task_35['money']; - $arr['company_account_type'] = 2; - }else{ - /** - * 判断入股任务 单次类型 是否超时 - * 未超时时刷新开始结束时间 - * 超时则关闭 - */ - if($data['template_info']['day_count']<=$day){ - TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 0]); - try{ - Task::where('id', $data['task_id'])->update(['create_time' => $task_35['start_time']+86400,'update_time' =>time(),'start_time'=>$task_35['start_time']+86400,'end_time'=>$task_35['start_time']+86400+86399]); - }catch(\Exception $e){ - $start_time = strtotime(date('Y-m-d')); - Task::where('id', $data['task_id'])->update(['create_time' => $start_time+86400,'update_time' =>time(),'start_time'=>$start_time+86400,'end_time'=> $start_time + 86400+86399]); - } - return false; - } - - if($data['template_info']['day_count']>$day){ - Task::where('id', $data['task_id'])->update(['status' =>5]); - Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data)); - return false; - } +// if($task_35['status']==3 && $data['template_info']['day_count']<=$day){ +// $name = $task_35['director_info']['nickname']; +// $arr['status'] = 1; +// $arr['money'] = $task_35['money']; +// $arr['company_account_type'] = 2; +// }else{ + if ($task_35['status'] == 3) { + return true; } + /** + * 判断入股任务 单次类型 是否超时 + * 未超时时刷新开始结束时间 + * 超时则关闭 + */ + if($data['template_info']['day_count']<=$day){ + TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 0]); + try{ + Task::where('id', $data['task_id'])->update(['create_time' => $task_35['start_time']+86400,'update_time' =>time(),'start_time'=>$task_35['start_time']+86400,'end_time'=>$task_35['start_time']+86400+86399]); + }catch(\Exception $e){ + $start_time = strtotime(date('Y-m-d')); + Task::where('id', $data['task_id'])->update(['create_time' => $start_time+86400,'update_time' =>time(),'start_time'=>$start_time+86400,'end_time'=> $start_time + 86400+86399]); + } + return false; + } + + if($data['template_info']['day_count']>$day){ + Task::where('id', $data['task_id'])->update(['status' =>5]); + Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data)); + return false; + } +// } }else{ Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为空：' . json_encode($data)); return false; @@ -423,7 +426,7 @@ class CeshiController extends BaseApiController if($data['template_info']['day_count'] >= $day){ Task::where('id', $data['task_id'])->update(['status' =>5]); - Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data)); + Log::info( $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data)); return false; } @@ -579,7 +582,7 @@ class CeshiController extends BaseApiController { Log::info('村管理公司定时任务结算执行-开始'.date('Y-m-d H:i:s')); //today 今日未结算的任务计划 - $taskSchedulingPlanList = TaskSchedulingPlan::whereDay('end_time','today') + $taskSchedulingPlanList = TaskSchedulingPlan::whereDay('end_time','yesterday') ->withJoin(['scheduling'], 'left') ->where('scheduling.company_type', 17) ->where('scheduling.company_id', 33) @@ -587,11 +590,11 @@ class CeshiController extends BaseApiController ->with(['template_info']) ->select() ->toArray(); - dd($taskSchedulingPlanList); + foreach($taskSchedulingPlanList as $taskSchedulingPlan){ - if ($taskSchedulingPlan['template_info']['type'] == 69) { + TaskLogic::villageTaskSettlement($taskSchedulingPlan); - } + // queue(VillageTaskSettlementJob::class, $taskSchedulingPlan); } Log::info('村管理公司定时任务结算执行-结束'.date('Y-m-d H:i:s'));