From 606881688c8a669717efa5bcb3474c7f4a61208b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 29 Dec 2023 19:02:44 +0800 Subject: [PATCH 1/5] =?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/controller/api/Auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index cf3b50fb..eb615d63 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1613,8 +1613,8 @@ class Auth extends BaseController if ($status == 1) { $datas['business_status']=2; $datas['mer_settlement_agree_status']=1; - $datas['financial_bank']=json_encode(['name'=>$merchant_intention['bank_username'], - 'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_opening'],'bank_branch'=>""]); + $datas['financial_bank']=json_encode(['name'=>$merchant_intention['company_name'], + 'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_username'],'bank_branch'=>""]); }else{ $datas['business_status']=3; } From 8dee357578f7cc6b32c1948fbd7ef9c709d2dcfa Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 29 Dec 2023 19:09:30 +0800 Subject: [PATCH 2/5] =?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/controller/api/Auth.php | 2 +- app/controller/api/store/merchant/Merchant.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index eb615d63..86dfd516 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1614,7 +1614,7 @@ class Auth extends BaseController $datas['business_status']=2; $datas['mer_settlement_agree_status']=1; $datas['financial_bank']=json_encode(['name'=>$merchant_intention['company_name'], - 'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_username'],'bank_branch'=>""]); + 'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_username'],'bank_branch'=>$merchant_intention['bank_opening']]); }else{ $datas['business_status']=3; } diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 0c309dbc..df132182 100755 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -328,9 +328,10 @@ class Merchant extends BaseController 'extract_minimum_line' => $extract_minimum_line, //提现最低额度 'extract_minimum_num' => $extract_minimum_num, //提现最低次数 'extract_money' => $_extract, //可提现金额 - 'financial_bank_bank' => $merchant->financial_bank->name ?? '', //银行账户姓名 - 'financial_bank_opening' => $merchant->financial_bank->bank ?? '', //开户行 + 'financial_bank_name' => $merchant->financial_bank->name ?? '', //银行账户姓名 + 'financial_bank_bank' => $merchant->financial_bank->bank ?? '', //开户行 'financial_bank_code' => $merchant->financial_bank->bank_code ?? '', //银行账号 + 'financial_bank_branch' => $merchant->financial_bank->bank_branch ?? '', //开户行地址 'financial_type' => $merchant->financial_type, //提现方式 'ot_margin' => $merchant->ot_margin, //提现方式 From 836630a8e45a5d3a4d88f1dbd6f4c27edd37e1aa Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 2 Jan 2024 13:58:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E8=AE=A2=E5=8D=95=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Logistics.php | 38 +++++++++++++++++++++++ route/api.php | 2 ++ 2 files changed, 40 insertions(+) diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php index 342651cf..c94e5015 100755 --- a/app/controller/api/dataview/Logistics.php +++ b/app/controller/api/dataview/Logistics.php @@ -115,6 +115,44 @@ class Logistics extends BaseController return app('json')->success(compact('count', 'list')); } + // 三轮车订单排行榜 + public function vehicleOrderRanking() + { + // 查区县的镇农科公司 + $list = []; + + // 先从供销系统 查出镇下边的所有配送员-小组服务公司的负责人 + $serviceGroupCompanyIds = Db::connect('work_task')->name('company') + ->where(['area'=> $this->areaCode, 'company_type'=>18]) + ->column('id'); + + $userIdList = Db::connect('work_task')->name('user') + ->whereIn('company_id', $serviceGroupCompanyIds) + ->where(['group_id'=>5]) + ->field('id, nickname')->select()->toArray(); + + // 从物流系统 查物流订单排序 + $topCourierList = Db::connect('logistics')->name('logistics') + ->field(['courier_id','courier_name','COUNT(order_id) AS order_count']) + ->whereIn('courier_id', array_column($userIdList, 'id')) + ->group('courier_id') + ->order('order_count DESC') + ->select(); + + foreach ($topCourierList as $topCourier) { + // 三轮车车牌号 根据配送员id反查公司id，公司id反查车牌号 + $courier = Db::connect('work_task')->name('user')->where(['id'=>$topCourier['courier_id']])->find(); + $vehicleRent = Db::connect('work_task')->name('vehicle_rent')->where(['rent_company_id'=>$courier['company_id']])->find(); + $topCourier['id'] = $vehicleRent['car_id']; + $topCourier['license'] = $vehicleRent['car_license']; + $topCourier['area_code'] = $courier['area']; + $topCourier['street_code'] = $courier['street']; + $list[] = $topCourier; + } + + return app('json')->success($list); + } + // 镇级最新物流配送详情 public function latestLogistics() { diff --git a/route/api.php b/route/api.php index db68d84b..c243955c 100644 --- a/route/api.php +++ b/route/api.php @@ -766,6 +766,8 @@ Route::group('api/', function () { Route::get('logistics_count', 'Logistics/logisticsCount'); Route::get('logistics_map_count', 'Logistics/logisticsMapCount'); Route::get('logistics_list', 'Logistics/logisticsList'); + Route::get('vehicle_order_ranking', 'Logistics/vehicleOrderRanking'); + /**---------------------物流溯源监控大屏api---------------------- end **/ From 9aba394a3638a037b24cd6e1c4e72a5f3aa0f6fe Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 2 Jan 2024 15:54:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Logistics.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php index c94e5015..7e3e6a19 100755 --- a/app/controller/api/dataview/Logistics.php +++ b/app/controller/api/dataview/Logistics.php @@ -3,6 +3,7 @@ namespace app\controller\api\dataview; use app\common\model\Company; +use app\common\model\store\order\StoreOrderProduct; use app\common\repositories\BaseRepository; use crmeb\basic\BaseController; use think\App; @@ -126,6 +127,9 @@ class Logistics extends BaseController ->where(['area'=> $this->areaCode, 'company_type'=>18]) ->column('id'); + if (empty($serviceGroupCompanyIds)) { + return app('json')->success($list); + } $userIdList = Db::connect('work_task')->name('user') ->whereIn('company_id', $serviceGroupCompanyIds) ->where(['group_id'=>5]) @@ -139,10 +143,15 @@ class Logistics extends BaseController ->order('order_count DESC') ->select(); + foreach ($topCourierList as $topCourier) { // 三轮车车牌号 根据配送员id反查公司id，公司id反查车牌号 $courier = Db::connect('work_task')->name('user')->where(['id'=>$topCourier['courier_id']])->find(); + $vehicleRent = Db::connect('work_task')->name('vehicle_rent')->where(['rent_company_id'=>$courier['company_id']])->find(); + if (empty($vehicleRent)) { + continue; + } $topCourier['id'] = $vehicleRent['car_id']; $topCourier['license'] = $vehicleRent['car_license']; $topCourier['area_code'] = $courier['area']; @@ -305,6 +314,10 @@ class Logistics extends BaseController $query->whereBetween('ps_time', [$startTime, $endTime]); })->count(); } + foreach ($list as &$item) { + $item['product_name'] = StoreOrderProduct::alias('o')->join('store_product p', 'o.product_id=p.product_id')->where('o.order_id', $item['order_id'])->value('p.store_name'); + } + unset($item); return app('json')->success(compact('count', 'list')); } } \ No newline at end of file From 96d20241b7e2813a945c085cb91652696a93b827 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 2 Jan 2024 16:08:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Logistics.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php index 7e3e6a19..5f858cf1 100755 --- a/app/controller/api/dataview/Logistics.php +++ b/app/controller/api/dataview/Logistics.php @@ -314,10 +314,11 @@ class Logistics extends BaseController $query->whereBetween('ps_time', [$startTime, $endTime]); })->count(); } + $list = $list->toArray(); foreach ($list as &$item) { $item['product_name'] = StoreOrderProduct::alias('o')->join('store_product p', 'o.product_id=p.product_id')->where('o.order_id', $item['order_id'])->value('p.store_name'); } - unset($item); + return app('json')->success(compact('count', 'list')); } } \ No newline at end of file