From 869faf2f44f0e15607f8c111ca0dd839fbe94788 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 5 Sep 2024 21:57:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(StoreProductLists,=20WorkbenchLogic):?= =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=8A=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=8F=8A=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/statistics/StoreProductLists.php | 31 ++++++++++++++----- app/store/logic/WorkbenchLogic.php | 24 +++++++------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/app/admin/lists/statistics/StoreProductLists.php b/app/admin/lists/statistics/StoreProductLists.php index fb3586f9..b6bb6704 100644 --- a/app/admin/lists/statistics/StoreProductLists.php +++ b/app/admin/lists/statistics/StoreProductLists.php @@ -80,21 +80,36 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $list = StoreProduct::where($this->searchWhere) ->alias('p') // 为 StoreProduct 表设置别名 ->limit($this->limitOffset, $this->limitLength) - ->field('p.id, p.store_name, p.image,p.stock as total_stock, + ->field('p.id, p.store_name, p.image,p.stock as total_stock,p.unit, (SELECT SUM(c.cart_num) FROM `la_store_order_cart_info` c WHERE c.product_id=p.id AND c.is_pay=1 AND c.delete_time IS NULL) AS sales, (SELECT SUM(b.stock) FROM `la_store_branch_product` b WHERE b.product_id=p.id AND b.delete_time IS NULL) AS store_stock, (SELECT SUM(w.nums) FROM `la_warehouse_product_storege` w WHERE w.product_id=p.id AND w.delete_time IS NULL) AS warehouse_stock, - (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.delete_time IS NULL) AS total_purchase, - (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.is_pay=1 AND wp.delete_time IS NULL) AS total_completed_amount, - (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.is_pay=0 AND wp.delete_time IS NULL) AS total_outstanding_amount') + (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.financial_pm=1 AND wp.delete_time IS NULL) AS total_purchase, + (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.financial_pm=1 AND wp.is_pay=1 AND wp.delete_time IS NULL) AS total_completed_amount, + (SELECT SUM(wp.total_price) FROM `la_warehouse_product` wp WHERE wp.product_id=p.id AND wp.financial_pm=1 AND wp.is_pay=0 AND wp.delete_time IS NULL) AS total_outstanding_amount') ->order($this->sortOrder) ->select() ->each(function ($item) { // 计算总库存 - $item->total_completed_amount=$item->total_completed_amount??0; - $item->warehouse_stock=$item->warehouse_stock??0; - $item->total_outstanding_amount=$item->total_outstanding_amount??0; - $item->total_purchase=$item->total_purchase??0; + $unit_name=StoreProductUnit::where('id',$item->unit)->value('name'); + $item->sales=$item->sales.'|'.$unit_name; + $item->store_stock=$item->store_stock.'|'.$unit_name; + $item->warehouse_stock=$item->warehouse_stock.'|'.$unit_name; + if($item->total_completed_amount){ + $item->total_completed_amount=$item->total_completed_amount.'元'; + }else{ + $item->total_completed_amount='0元'; + } + if($item->total_outstanding_amount){ + $item->total_outstanding_amount=$item->total_outstanding_amount.'元'; + }else{ + $item->total_outstanding_amount='0元'; + } + if($item->total_purchase){ + $item->total_purchase=$item->total_purchase.'元'; + }else{ + $item->total_purchase='0元'; + } }) ->toArray(); return $list; diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 95c54f02..bf80beba 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -74,22 +74,24 @@ class WorkbenchLogic extends BaseLogic //余额支付总金额 $data['balance_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::BALANCE_PAY])); //微信条码支付总金额 - $data['wechat_code_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::WECHAT_PAY_BARCODE])); + $data['wechat_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => [7,9]])); //支付条码支付总金额 - $data['alipay_code_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::ALIPAY_BARCODE])); + $data['alipay_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::ALIPAY_BARCODE])); + //采购款 + $data['purchase_funds_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::PURCHASE_FUNDS])); + //现金 + $data['cash_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::CASH_PAY])); //线下收银总金额 - $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['shipping_type' => 3])); + // $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['shipping_type' => 3])); //现金收银总金额 - $data['cash_amount'] = StoreCashFinanceFlow::where($cashFinanceWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('cash_price'); + // $data['cash_amount'] = StoreCashFinanceFlow::where($cashFinanceWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('cash_price'); //核销订单金额 - $data['verify_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['shipping_type' => 2])); + // $data['verify_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['shipping_type' => 2])); //门店收益金额 $data['income_amount'] = StoreFinanceFlow::where($storeFinanceWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number'); //门店收款金额 - $all_where['paid'] = 1; -// $data['receipt_amount'] = OrderLogic::dayPayPrice($all_where,date('Y-m-d',time())); - $data['receipt_amount'] = OrderLogic::dealFlexiblePrice($all_where,$startTime,$endTime); -// $data['receipt_amount'] = UserRecharge::where($userRechargeWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('price'); + // $all_where['paid'] = 1; + // $data['receipt_amount'] = OrderLogic::dealFlexiblePrice($all_where,$startTime,$endTime); //保证金金额 $data['deposit_amount'] = StoreFinanceFlow::where($storeFinanceWhereTwo)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number'); /**门店损耗金 */ @@ -210,8 +212,8 @@ class WorkbenchLogic extends BaseLogic ]; $data['pay_type'] = [ - ['name' => '线上收银订单', 'value' => bcsub($data['order_amount'], bcadd($data['verify_amount'], $data['cash_amount'], 2), 2)], - ['name' => '核销订单', 'value' => $data['verify_amount']], + // ['name' => '线上收银订单', 'value' => bcsub($data['order_amount'], bcadd($data['verify_amount'], $data['cash_amount'], 2), 2)], + // ['name' => '核销订单', 'value' => $data['verify_amount']], ['name' => '现金收银订单', 'value' => $data['cash_amount']], ]; return $data;