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

更新

Browse Source
This commit is contained in:
shengchanzhe 2023-09-09 22:00:39 +08:00
parent 9000fc82bd
commit 2c95c0b8e3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,9 +93,11 @@ class TaskController extends BaseApiController
$parmas['start_time']=date('Y-m-d',$task['start_time']); $parmas['start_time']=date('Y-m-d',$task['start_time']);
$parmas['end_time']=$task['end_time'].' 23:59:59'; $parmas['end_time']=$task['end_time'].' 23:59:59';
$list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
$shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas);
if ($task != false) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
$find['extend']=$task['extend']; $find['extend']=$task['extend'];
$find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0;
if($transaction_pool==0){ if($transaction_pool==0){
$find['transaction_pool']=0; $find['transaction_pool']=0;
}else{ }else{

1
app/common/logic/task/TaskLogic.php
View File

@ -74,7 +74,6 @@ class TaskLogic extends BaseLogic
public static function CronAdd(array $v, $datas): bool public static function CronAdd(array $v, $datas): bool
{ {
try { try {
$v['day_count']=$v['day_count']+1;
if ($v['types'] == 3) { if ($v['types'] == 3) {
$task = Task::where('template_id', $v['id'])->find(); $task = Task::where('template_id', $v['id'])->find();
if ($task) { if ($task) {