From 706cf3f739dce9f65d010c5ad46d84bc47efc585 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Tue, 17 Oct 2023 20:59:54 +0800
Subject: [PATCH] Update

---
 app/Admin/Controllers/OrderController.php | 8 +++++++-
 resources/lang/zh_CN/order.php            | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index f40366b4..77cd95e7 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -13,6 +13,7 @@ use App\Admin\Actions\Show\OrderRemark;
 use App\Admin\Extensions\Grid\Tools\Order\ExportProduct;
 use App\Admin\Renderable\Grid\Filter\OrderStatusIn;
 use App\Admin\Renderable\PackageProductSimpleTable;
+use App\Constants\OrderStatus;
 use App\Enums\PayWay;
 use App\Models\Order;
 use App\Models\OrderActivity;
@@ -33,7 +34,6 @@ use Dcat\Admin\Show;
 use Dcat\Admin\Widgets\Box;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
-use App\Constants\OrderStatus;
 
 class OrderController extends AdminController
 {
@@ -367,6 +367,9 @@ class OrderController extends AdminController
                         $show->field('reduced_amount')->as(function ($v) {
                             return bcdiv($v, 100, 2);
                         })->prepend('- ￥');
+                        $show->field('point_discount_amount')->as(function ($v) {
+                            return bcdiv($v, 100, 2);
+                        })->prepend('- ￥');
                         $show->field('profit');
                         $show->field('total_amount')->as(function ($v) {
                             return bcdiv($v, 100, 2);
@@ -422,6 +425,9 @@ class OrderController extends AdminController
                     $grid->column('coupon_discount_amount', '优惠券折扣')->display(function ($value) {
                         return bcdiv($value, 100, 2);
                     })->prepend('￥');
+                    $grid->column('point_discount_amount', '积分抵扣')->display(function ($value) {
+                        return bcdiv($value, 100, 2);
+                    })->prepend('￥');
                     $grid->column('reduced_amount', '减免金额')->display(function ($value) {
                         return bcdiv($value, 100, 2);
                     })->prepend('￥');
diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php
index 56ab0fa5..9efeccf1 100644
--- a/resources/lang/zh_CN/order.php
+++ b/resources/lang/zh_CN/order.php
@@ -58,6 +58,7 @@ return [
         'market_price' => '市场价',
         'cost_price' => '成本价',
         'out_trade_no' => '支付流水号',
+        'point_discount_amount' => '积分抵扣',
     ],
     'options' => [
     ],