From 413166a7e4ca4a05ab0ba1774b15d9e10c6d54b0 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 23 Aug 2023 16:57:19 +0800 Subject: [PATCH 1/4] =?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/common/model/informationg/UserInformationg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 5ec377ced..6addfed02 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -38,7 +38,7 @@ class UserInformationg extends BaseModel { return self::where($param)->with('company') ->field('id,area_id,area_id as area_name,street_id,street_id as street_name,village_id,village_id as village_name, street_id as street_name,brigade_id,brigade_id as brigade_name,name,phone,age,address,create_time,update_time') - ->order('id', 'desc') + ->order('update_time', 'desc') ->page($page)->limit($size)->select(); } From beb27ccc99cde8000c1657783819ac41f6a69939 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 23 Aug 2023 17:12:14 +0800 Subject: [PATCH 2/4] =?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/job/TaskInformationJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index e5e1d645f..4169615db 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -42,7 +42,7 @@ class TaskInformationJob $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,'extend'=>json_encode($shang_date_total_price)]); + Task::where('id', $data['task_id'])->update(['status' => 5,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]); return false; } $name = $shang_date_total_price['name']; From 1388f669dab3c19944269e00210167534e74261e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 23 Aug 2023 17:13:09 +0800 Subject: [PATCH 3/4] =?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/job/TaskInformationJob.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index 4169615db..634fb6c16 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -44,6 +44,8 @@ class TaskInformationJob Log::info('任务结算失败，交易金额未达到要求：' . json_encode($data)); Task::where('id', $data['task_id'])->update(['status' => 5,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]); return false; + }else{ + Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]); } $name = $shang_date_total_price['name']; $arr['status'] = $shang_date_total_price['arr']['status']; From 31f8448ac1280f684b0712be62ba85bda34c1191 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 23 Aug 2023 17:20:19 +0800 Subject: [PATCH 4/4] =?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/job/TaskInformationJob.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index 634fb6c16..3d64ab416 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -42,10 +42,10 @@ class TaskInformationJob $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,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]); + Task::where('id', $data['task_id'])->update(['status' => 5,'extend'=>json_encode($shang_date_total_price)]); return false; }else{ - Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]); + Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]); } $name = $shang_date_total_price['name']; $arr['status'] = $shang_date_total_price['arr']['status'];