pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Update

base
Jing Li 2023-10-17 20:59:54 +08:00
parent 3b6a1e024e
commit 706cf3f739
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Admin/Controllers/OrderController.php
View File

@ -13,6 +13,7 @@ use App\Admin\Actions\Show\OrderRemark;
use App\Admin\Extensions\Grid\Tools\Order\ExportProduct; use App\Admin\Extensions\Grid\Tools\Order\ExportProduct;
use App\Admin\Renderable\Grid\Filter\OrderStatusIn; use App\Admin\Renderable\Grid\Filter\OrderStatusIn;
use App\Admin\Renderable\PackageProductSimpleTable; use App\Admin\Renderable\PackageProductSimpleTable;
use App\Constants\OrderStatus;
use App\Enums\PayWay; use App\Enums\PayWay;
use App\Models\Order; use App\Models\Order;
use App\Models\OrderActivity; use App\Models\OrderActivity;
@ -33,7 +34,6 @@ use Dcat\Admin\Show;
use Dcat\Admin\Widgets\Box; use Dcat\Admin\Widgets\Box;
use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Constants\OrderStatus;
class OrderController extends AdminController class OrderController extends AdminController
{ {
@ -367,6 +367,9 @@ class OrderController extends AdminController
$show->field('reduced_amount')->as(function ($v) { $show->field('reduced_amount')->as(function ($v) {
return bcdiv($v, 100, 2); return bcdiv($v, 100, 2);
})->prepend('- ￥'); })->prepend('- ￥');
$show->field('point_discount_amount')->as(function ($v) {
return bcdiv($v, 100, 2);
})->prepend('- ￥');
$show->field('profit'); $show->field('profit');
$show->field('total_amount')->as(function ($v) { $show->field('total_amount')->as(function ($v) {
return bcdiv($v, 100, 2); return bcdiv($v, 100, 2);
@ -422,6 +425,9 @@ class OrderController extends AdminController
$grid->column('coupon_discount_amount', '优惠券折扣')->display(function ($value) { $grid->column('coupon_discount_amount', '优惠券折扣')->display(function ($value) {
return bcdiv($value, 100, 2); return bcdiv($value, 100, 2);
})->prepend('￥'); })->prepend('￥');
$grid->column('point_discount_amount', '积分抵扣')->display(function ($value) {
return bcdiv($value, 100, 2);
})->prepend('￥');
$grid->column('reduced_amount', '减免金额')->display(function ($value) { $grid->column('reduced_amount', '减免金额')->display(function ($value) {
return bcdiv($value, 100, 2); return bcdiv($value, 100, 2);
})->prepend('￥'); })->prepend('￥');

1
resources/lang/zh_CN/order.php
View File

@ -58,6 +58,7 @@ return [
'market_price' => '市场价', 'market_price' => '市场价',
'cost_price' => '成本价', 'cost_price' => '成本价',
'out_trade_no' => '支付流水号', 'out_trade_no' => '支付流水号',
'point_discount_amount' => '积分抵扣',
], ],
'options' => [ 'options' => [
], ],