修改交易金字段名deposit_normal->trade_balance

4 years ago · d7df33ccb4
4 changed files with 9 additions and 36 deletions
--- a/app/Admin/Controllers/DepositController.php
+++ b/app/Admin/Controllers/DepositController.php
@ -2,18 +2,10 @@

 namespace App\Admin\Controllers;

-use App\Admin\Extensions\Grid\AuditSupplier;
 use App\Admin\Repositories\Supplier;
-use App\Common\ProductStatus;
-use App\Common\UserStatus;
-use App\Models\Product;
-use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Route;

 class DepositController extends AdminController
 {
@ -31,9 +23,7 @@ class DepositController extends AdminController
 			$grid->disableViewButton();
 			$grid->column('id')->sortable();
 			$grid->column('name');
-			$grid->column('deposit_normal','正常');
-			//$grid->column('deposit_frozen','冻结中');
-			//$grid->column('deposit_used','已消费');
+			$grid->column('trade_balance','正常');
        });
    }

@ -45,11 +35,9 @@ class DepositController extends AdminController
    protected function form()
    {
        return Form::make(new Supplier(), function (Form $form) {
-				$form->decimal('deposit_normal','正常')->rules('required|numeric|min:0|not_in:0',[
-					'*' => '金额为必填字段且必须大于0',
-				]);
-			//$form->decimal('deposit_frozen','冻结中')->disable();
-			//$form->decimal('deposit_used','已消费')->disable();
+			$form->decimal('trade_balance','正常')->rules('required|numeric|min:0|not_in:0',[
+				'*' => '金额为必填字段且必须大于0',
+			]);
 			$form->disableCreatingCheck();
 			$form->disableViewButton();
 			$form->disableDeleteButton();
--- a/app/AdminSupplier/Controllers/DepositLogController.php
+++ b/app/AdminSupplier/Controllers/DepositLogController.php
@ -36,7 +36,7 @@ class DepositLogController extends AdminController

 				$row->column(3, function (Column $column) {
 					$column->row(Card::make('正常', function () {
-						$price = Admin::user()->deposit_normal ?? 0;
+						$price = Admin::user()->trade_balance ?? 0;
 						return <<<HTML
 <div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
    <h2 class="ml-1 font-large-1 text-primary">$price</h2>
--- a/app/AdminSupplier/Controllers/FinanceStatisticsController.php
+++ b/app/AdminSupplier/Controllers/FinanceStatisticsController.php
@ -4,6 +4,7 @@ namespace App\AdminSupplier\Controllers;

 use App\AdminSupplier\Metrics\Examples\FinanceStatistics;
 use App\Common\PayType;
+use App\Models\DepositLog;
 use App\Models\OrderProductItem;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Layout\Column;
@ -109,7 +110,7 @@ HTML;

 				$row->column(3, function (Column $column) use ($profit) {
 					$column->row(Card::make('交易费', function () use ($profit) {
-						$price = Admin::user()->deposit_used;
+						$price = DepositLog::where('supplier_id', Admin::user()->id)->sum('price');
 						return <<<HTML
 <div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
    <h2 class="ml-1 font-large-1 text-primary">$price</h2>
--- a/app/Listeners/SupplierEventSubscriber.php
+++ b/app/Listeners/SupplierEventSubscriber.php
@ -15,29 +15,13 @@ class SupplierEventSubscriber
 		$supplier = $event->supplier;

 		//如果交易金有变动
-		if ($supplier->isDirty('deposit_normal')) {
+		if ($supplier->isDirty('trade_balance')) {
 			DepositLog::query()->create([
-				'price' => bcsub($supplier->deposit_normal,$supplier->getOriginal('deposit_normal')),
+				'price' => bcsub($supplier->trade_balance,$supplier->getOriginal('trade_balance')),
 				'type' => StatementTraits::$deposit[0],
 				'supplier_id' => $supplier->id
 			]);
 		}
-
-		if ($supplier->isDirty('deposit_frozen')) {
-			DepositLog::query()->create([
-				'price' => bcsub($supplier->deposit_frozen,$supplier->getOriginal('deposit_frozen')),
-				'type' => StatementTraits::$deposit[1],
-				'supplier_id' => $supplier->id
-			]);
-		}
-
-		if ($supplier->isDirty('deposit_used')) {
-			DepositLog::query()->create([
-				'price' => bcsub($supplier->deposit_used,$supplier->getOriginal('deposit_used')),
-				'type' => StatementTraits::$deposit[2],
-				'supplier_id' => $supplier->id
-			]);
-		}
 	}

 	/**