diff --git a/app/admin/lists/statistics/StoreProductLists.php b/app/admin/lists/statistics/StoreProductLists.php
index fb3586f91..b6bb67044 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 95c54f02a..bf80beba0 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;