diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index 619ae10..3a4249b 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -7,7 +7,9 @@ use App\AdminAgent\Extensions\Grid\ChangeOrderStatus; use App\AdminAgent\Repositories\Order; use App\Common\OrderStatus; use App\Common\PayType; +use App\Models\Agent; use App\Models\OrderProductItem; +use App\Models\Statement; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -128,9 +130,13 @@ class OrderController extends AdminController $grid->column('paid_money'); $grid->column('收益') ->display(function () { - if ($this->status == OrderStatus::SUCCESS && !empty($this->orderProductItem)) { - $item = $this->orderProductItem->toArray(); - return bcsub($this->price, array_sum(array_column($item, 'price')), 2); + if ($this->status == OrderStatus::SUCCESS) { + return Statement::where([ + 'user_id' => Admin::user()->id, + 'access_id' => $this->id, + 'access_type' => \App\Models\Order::class, + 'user_type' => Agent::class, + ])->value('price'); } }); $grid->column('paid_at'); diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php index 88bc3a7..aff9170 100644 --- a/app/AdminSupplier/Controllers/OrderController.php +++ b/app/AdminSupplier/Controllers/OrderController.php @@ -7,6 +7,7 @@ use App\AdminSupplier\Repositories\Order; use App\Common\OrderStatus; use App\Common\PayType; use App\Models\Agent; +use App\Models\Statement; use App\Models\Supplier; use Dcat\Admin\Admin; use Dcat\Admin\Form; @@ -74,9 +75,13 @@ class OrderController extends AdminController $grid->column('paid_money'); $grid->column('收益') ->display(function () { - if ($this->status == OrderStatus::SUCCESS && !empty($this->orderProductItem)) { - $item = $this->orderProductItem->toArray(); - return bcadd(0, array_sum(array_column($item, 'price')), 2); + if ($this->status == OrderStatus::SUCCESS) { + return Statement::where([ + 'user_id' => Admin::user()->id, + 'access_id' => $this->id, + 'access_type' => \App\Models\Order::class, + 'user_type' => Supplier::class, + ])->value('price'); } }); $grid->column('paid_at'); diff --git a/resources/lang/zh_CN/industry-order.php b/resources/lang/zh_CN/industry-order.php index aa01256..6b893eb 100644 --- a/resources/lang/zh_CN/industry-order.php +++ b/resources/lang/zh_CN/industry-order.php @@ -19,6 +19,7 @@ return [ 'picture' => '产品图片', 'status' => '订单状态', 'pay_type' => '支付方式', + 'pay_money' => '线上支付金额', 'paid_at' => '付款时间', 'verify_code' => '核销码', 'timeout' => '订单超时时间', diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php index 13f8c90..9cd465c 100644 --- a/resources/lang/zh_CN/order.php +++ b/resources/lang/zh_CN/order.php @@ -15,7 +15,7 @@ return [ 'num' => '购买数量', 'order_no' => '订单号', 'paid_at' => '付款时间', - 'paid_money' => '已付金额', + 'paid_money' => '线上支付金额', 'pay_type' => '支付方式', 'picture' => '产品图片', 'price' => '订单总价',