From fbbd46e61442937adf6652dd57ab77fe17bb0798 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 1 Mar 2023 17:43:54 +0800
Subject: [PATCH] order

---
 app/Admin/Controllers/Store/OrderController.php | 15 +++++++++++++--
 app/Admin/Controllers/Store/StockController.php | 12 ++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Admin/Controllers/Store/OrderController.php b/app/Admin/Controllers/Store/OrderController.php
index b40d4023..b865b014 100644
--- a/app/Admin/Controllers/Store/OrderController.php
+++ b/app/Admin/Controllers/Store/OrderController.php
@@ -9,6 +9,7 @@ use App\Enums\PayWay;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Widgets\{Box, Tab, Card};
 use App\Constants\OrderStatus;
+use App\Models\Store\Store;
 
 class OrderController extends AdminController
 {
@@ -43,7 +44,7 @@ class OrderController extends AdminController
 
         $grid->model()->orderBy('created_at', 'desc');
 
-        $grid->column('store.title', '门店');
+        $grid->column('store_id', '门店')->display(fn () => data_get($this->store, 'title', '线上商城'));
         $grid->column('sn')->copyable();
         $grid->column('user_id')->display(function () {
             $nickname = $this->userInfo?->nickname ?? '---';
@@ -78,8 +79,18 @@ class OrderController extends AdminController
         $grid->showViewButton($user->can('dcat.admin.store.order.show'));
 
         $grid->filter(function (Grid\Filter $filter) {
+            $stores = Store::pluck('title', 'id')->all();
+            $stores[0] = '线上商城';
+            ksort($stores);
             $filter->panel();
-            $filter->equal('store_id', '门店')->select('api/store')->width(3);
+            $filter->where('store_id', function ($q) {
+                $input = $this->input;
+                if ($input) {
+                    $q->where('store_id', $input);
+                } else {
+                    $q->where(fn($q) => $q->whereNull('store_id')->orWhere('store_id', 0));
+                }
+            } ,'门店')->select($stores)->width(3);
             $filter->like('sn')->width(3);
             $filter->where('user_id', function ($q) {
                 $q->where(function ($q) {
diff --git a/app/Admin/Controllers/Store/StockController.php b/app/Admin/Controllers/Store/StockController.php
index f442b3a2..ccef755d 100644
--- a/app/Admin/Controllers/Store/StockController.php
+++ b/app/Admin/Controllers/Store/StockController.php
@@ -34,16 +34,16 @@ class StockController extends AdminController
             return '<span class="text-'.($value > 0 ? 'success' : 'danger') .'">'.$value.'</span>';
         });
         // $grid->column('balance');
-        $grid->column('sell_price', '总销售价')->display(function () {
-            $amount = abs($this->amount);
-            $prcie = data_get($this->productSku, 'sell_price', 0);
-            return round($prcie * $amount / 100, 2, PHP_ROUND_HALF_DOWN);
-        });
         $grid->column('cost_price', '总成本价')->display(function () {
             $amount = abs($this->amount);
             $prcie = data_get($this->productSku, 'cost_price', 0);
             return round($prcie * $amount / 100, 2, PHP_ROUND_HALF_DOWN);
         });
+        $grid->column('sell_price', '总销售价')->display(function () {
+            $amount = abs($this->amount);
+            $prcie = data_get($this->productSku, 'sell_price', 0);
+            return round($prcie * $amount / 100, 2, PHP_ROUND_HALF_DOWN);
+        });
         $grid->column('operator_name', '操作人');
         $grid->column('remarks', '备注');
         $grid->column('created_at', '操作时间');
@@ -110,8 +110,8 @@ class StockController extends AdminController
                         <td>统计</td>
                         <td>记录数: $count</td>
                         <td>数量: $amount</td>
-                        <td>总销售价: $sell</td>
                         <td>总成本价: $cost</td>
+                        <td>总销售价: $sell</td>
                     <tr>
                 </tbody>
             </table>