From de459e01d2c2e0db57ab0c95497b347630360f19 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Sat, 2 Dec 2023 13:53:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?dataview=20=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Order.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 5cd8c5bd..ffb6775f 100644 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -126,14 +126,16 @@ class Order extends BaseController $type = $this->request->get('type',2); // 1今日 2总计 $townList = Db::name('geo_street')->field('street_code,street_name')->where('area_code', $this->areaCode)->select()->toArray(); // 镇/街道列表 + $orderCount = 0; foreach ($townList as &$town) { // 查询订单数 $orderCountQuery = Db::name('product_order_log')->where('street_code', $town['street_code'])->where('status', 1); if ($type == 1) { $orderCountQuery->whereDay('create_time', 'today'); } - $orderCount = $orderCountQuery->count(); - $town['order_count'] = $orderCount; + $tempOrderCount = $orderCountQuery->count(); + $town['order_count'] = $tempOrderCount; + $orderCount += $tempOrderCount; } unset($town); // $orderRankingQuery = Db::name('product_order_log')->alias('op') @@ -149,6 +151,6 @@ class Order extends BaseController $orderCountArr = array_column($townList, 'order_count'); array_multisort($orderCountArr, SORT_DESC, $townList); - return app('json')->success($townList); + return app('json')->success(compact('orderCount', 'townList')); } } \ No newline at end of file From f9553c87ac25af705d9f50c52dd3f0d98f27bb31 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Sat, 2 Dec 2023 13:57:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?dataview=20=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Order.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index ffb6775f..83478f41 100644 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -127,7 +127,8 @@ class Order extends BaseController $type = $this->request->get('type',2); // 1今日 2总计 $townList = Db::name('geo_street')->field('street_code,street_name')->where('area_code', $this->areaCode)->select()->toArray(); // 镇/街道列表 $orderCount = 0; - foreach ($townList as &$town) { + $townOrderList = []; + foreach ($townList as $town) { // 查询订单数 $orderCountQuery = Db::name('product_order_log')->where('street_code', $town['street_code'])->where('status', 1); if ($type == 1) { @@ -136,8 +137,8 @@ class Order extends BaseController $tempOrderCount = $orderCountQuery->count(); $town['order_count'] = $tempOrderCount; $orderCount += $tempOrderCount; + $townOrderList[] = $town; } - unset($town); // $orderRankingQuery = Db::name('product_order_log')->alias('op') // ->leftJoin('geo_street s','op.street_code = s.street_code') // ->field('op.street_code,COUNT(op.order_id) AS order_count,s.street_name') @@ -149,8 +150,8 @@ class Order extends BaseController // } // $orderRankingList = $orderRankingQuery->group('op.street_code')->order('order_count desc')->select(); - $orderCountArr = array_column($townList, 'order_count'); - array_multisort($orderCountArr, SORT_DESC, $townList); - return app('json')->success(compact('orderCount', 'townList')); + $orderCountArr = array_column($townOrderList, 'order_count'); + array_multisort($orderCountArr, SORT_DESC, $townOrderList); + return app('json')->success(compact('orderCount', 'townOrderList')); } } \ No newline at end of file From 39e5ef9d03de4ea5d4111b81ed93e0112ec4434c Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Sat, 2 Dec 2023 14:45:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?debug=20=E4=BB=8A=E6=97=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Order.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 83478f41..ce1f6d15 100644 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -102,6 +102,7 @@ class Order extends BaseController $response = $client->request('GET', $getUrl); $courierData = json_decode($response->getBody(), true); $currOrderList[$k]['courier'] = $courierData['data']['courier_name']; + $currOrderList[$k]['status'] = $this->getStatusDesc($order['status']); } // 待取货订单数 @@ -154,4 +155,23 @@ class Order extends BaseController array_multisort($orderCountArr, SORT_DESC, $townOrderList); return app('json')->success(compact('orderCount', 'townOrderList')); } + + private function getStatusDesc($status) + { + // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成； 9: 拼团中 10: 待付尾款 11:尾款超时未付 -1：已退款） + $desc = [ + 0 => '待取货', + 1 => '待配送', + 2 => '待评价', + 3 => '已完成', + 9 => '拼团中', + 10 => '待付尾款', + 11 => '尾款超时未付', + -1 => '已退款', + ]; + if (!isset($desc[$status])) { + return '未知'; + } + return $desc[$status]; + } } \ No newline at end of file From 2e5bc125767c8a910f56dce0c0326ff336044489 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 2 Dec 2023 14:57:27 +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 --- crmeb/jobs/ImportProductJob.php | 1 - crmeb/services/SpreadsheetExcelService.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crmeb/jobs/ImportProductJob.php b/crmeb/jobs/ImportProductJob.php index 98dfb34a..05934c9c 100644 --- a/crmeb/jobs/ImportProductJob.php +++ b/crmeb/jobs/ImportProductJob.php @@ -10,7 +10,6 @@ class ImportProductJob implements JobInterface { public function fire($job, $data) { - Log::info('开始导入商品:'); if ($job->attempts() > 1) { $job->delete(); $this->failed($data); diff --git a/crmeb/services/SpreadsheetExcelService.php b/crmeb/services/SpreadsheetExcelService.php index ad83abab..f454ddb8 100644 --- a/crmeb/services/SpreadsheetExcelService.php +++ b/crmeb/services/SpreadsheetExcelService.php @@ -378,7 +378,7 @@ class SpreadsheetExcelService if($is_limit==true){ $limit=$sheet->getHighestRow(); if($limit>$count){ - throw new ValidateException('导入的条数超过限制数量:'.$count); + throw new ValidateException('导入的条数超过限制数量:'.$count.',当前表格数量'.$limit); } }