Merge remote-tracking branch 'origin/master'

app/AdminAgent/Controllers/AgentProductController.php

@@ -196,9 +196,10 @@ class AgentProductController extends AdminController
 				$form->editor('content');
 			} else {
 				$form->radio('type')
-					->options(['单品销售', '组合销售', '计调云产品'])
+					->options(['单品销售'])
 					->default(Admin::user()->type == AgentType::CLUSTER ? 1 : 0)->required()
-					->help('单品销售无需审核，组合销售需要审核才能上架')
+					//->help('单品销售无需审核，组合销售需要审核才能上架')
+					->help('单品销售无需审核')
 					->when(0, function (Form $form) {
 						/** 单品销售 **/
 						$form->selectTable('product_id', '供应商产品')
@@ -231,8 +232,12 @@ class AgentProductController extends AdminController
 							->model(\App\Models\AgentProduct::class);
 					});
 			}
-			$form->currency('price')->symbol('￥')->required();
-            $form->currency('original_price')->symbol('￥')->required();
+			$form->decimal('price',)->rules('required|numeric|min:0|not_in:0',[
+				'*' => '金额为必填字段且必须大于0',
+			]);
+			$form->decimal('original_price')->rules('required|numeric|min:0|not_in:0',[
+				'*' => '金额为必填字段且必须大于0',
+			]);
             $form->number('sale')->min(0)->default(0);
             $form->number('stock')->min(0)->default(8888)->required();
 
@@ -276,12 +281,17 @@ class AgentProductController extends AdminController
 				$options = Channel::selectOptions(fn($query) => $query->where('agent_id', $agent_id));
 				$form->multipleSelect('channel_id')->options(array_slice($options, 1, null, true));
 
-				$form->currency('earnest')->symbol('￥')
-					->default(0)->help('单位：元。不输入或输入 0 则不支持定金支付，必须和定金超时时间同时设置才会生效');
+				$form->decimal('earnest')->rules('required|numeric|min:0',[
+					'*' => '金额为必填字段且必须大于0',
+				])->default(0);
+
 				$form->number('earnest_timeout')->min(0)
 					->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且定金不退');
-				$form->currency('deposit')->symbol('￥')
-					->default(0)->help('单位：元。不输入或输入 0 则不支持订金支付，必须和订金超时时间同时设置才会生效');
+
+				$form->decimal('deposit')->rules('required|numeric|min:0',[
+					'*' => '金额为必填字段且必须大于0',
+				])->default(0);;
+
 				$form->number('deposit_timeout')->min(0)
 					->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且订金不退');
 

app/AdminSupplier/Controllers/DepositLogController.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\AdminSupplier\Controllers;
+
+use App\AdminAgent\Controllers\AdvertisingController;
+use App\AdminSupplier\Repositories\DepositLog;
+use App\Traits\StatementTraits;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class DepositLogController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new DepositLog('supplier'), function (Grid $grid) {
+			$grid->model()->where('supplier_id',Admin::user()->id);
+            $grid->column('id')->sortable();
+            $grid->column('price');
+            $grid->column('supplier.name','供应商');
+            $grid->column('type','类型')->using(StatementTraits::$depositText);
+            $grid->column('created_at');
+            $grid->column('updated_at')->sortable();
+
+			$grid->disableDeleteButton();
+			$grid->disableRowSelector();
+			$grid->disableCreateButton();
+			$grid->disableActions();
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('type','状态')->width(2)->select(StatementTraits::$depositText);
+
+            });
+        });
+    }
+
+    ///**
+    // * Make a show builder.
+    // *
+    // * @param mixed $id
+    // *
+    // * @return Show
+    // */
+    //protected function detail($id)
+    //{
+    //    return Show::make($id, new DepositLog(), function (Show $show) {
+    //        $show->field('id');
+    //        $show->field('price');
+    //        $show->field('supplier_id');
+    //        $show->field('type');
+    //        $show->field('created_at');
+    //        $show->field('updated_at');
+    //    });
+    //}
+	//
+    ///**
+    // * Make a form builder.
+    // *
+    // * @return Form
+    // */
+    //protected function form()
+    //{
+    //    return Form::make(new DepositLog(), function (Form $form) {
+    //        $form->display('id');
+    //        $form->text('price');
+    //        $form->text('supplier_id');
+    //        $form->text('type');
+	//
+    //        $form->display('created_at');
+    //        $form->display('updated_at');
+    //    });
+    //}
+}

app/AdminSupplier/Repositories/DepositLog.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\AdminSupplier\Repositories;
+
+use App\Models\DepositLog as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class DepositLog extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/AdminSupplier/routes.php

@@ -38,6 +38,7 @@ Route::group([
 	$router->resource('wallet', 'WalletController');
 	$router->resource('withdrawak_alipay', 'WithdrawalAlipayController');
 	$router->resource('withdrawak_bank', 'WithdrawalBankController');
+	$router->resource('deposit_log', 'DepositLogController');
 	//api
 	$router->any('send_text', 'WorkorderController@sendText');
 	$router->any('send_image', 'WorkorderController@sendImage');

app/Models/DepositLog.php

@@ -13,4 +13,9 @@ class DepositLog extends Model
 
     protected $table = 'deposit_log';
 	protected $guarded = ['id']; //不允许编辑的字段
+
+	public function supplier()
+	{
+		return $this->belongsTo(Supplier::class);
+	}
 }

database/migrations/2021_09_23_154719_update_deposit_log_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateDepositLogTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+		Schema::table('deposit_log', function (Blueprint $table) {
+			$table->dateTime('deleted_at')->nullable();
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

dcat_admin_ide_helper.php

@@ -12,19 +12,12 @@ namespace Dcat\Admin {
 
     /**
      * @property Grid\Column|Collection disable
-     * @property Grid\Column|Collection agent_id
      * @property Grid\Column|Collection created_at
-     * @property Grid\Column|Collection desc
+     * @property Grid\Column|Collection detail
      * @property Grid\Column|Collection id
      * @property Grid\Column|Collection name
-     * @property Grid\Column|Collection picture
-     * @property Grid\Column|Collection tag
-     * @property Grid\Column|Collection updated_at
-     * @property Grid\Column|Collection content
-     * @property Grid\Column|Collection know
-     * @property Grid\Column|Collection product_id
-     * @property Grid\Column|Collection detail
      * @property Grid\Column|Collection type
+     * @property Grid\Column|Collection updated_at
      * @property Grid\Column|Collection version
      * @property Grid\Column|Collection is_enabled
      * @property Grid\Column|Collection extension
@@ -44,7 +37,9 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection password
      * @property Grid\Column|Collection remember_token
      * @property Grid\Column|Collection username
+     * @property Grid\Column|Collection agent_id
      * @property Grid\Column|Collection display
+     * @property Grid\Column|Collection picture
      * @property Grid\Column|Collection sort
      * @property Grid\Column|Collection status
      * @property Grid\Column|Collection url
@@ -52,10 +47,12 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection buy_protocol
      * @property Grid\Column|Collection reg_protocol
      * @property Grid\Column|Collection agent_product_id
+     * @property Grid\Column|Collection product_id
      * @property Grid\Column|Collection supplier_id
      * @property Grid\Column|Collection agent_cloud_pid
      * @property Grid\Column|Collection category_id
      * @property Grid\Column|Collection channel_id
+     * @property Grid\Column|Collection content
      * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection deposit
      * @property Grid\Column|Collection deposit_timeout
@@ -65,6 +62,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection guide_price
      * @property Grid\Column|Collection is_cloud
      * @property Grid\Column|Collection is_rec
+     * @property Grid\Column|Collection know
      * @property Grid\Column|Collection original_price
      * @property Grid\Column|Collection pictures
      * @property Grid\Column|Collection price
@@ -91,14 +89,15 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection mchkey
      * @property Grid\Column|Collection province_id
      * @property Grid\Column|Collection rate
-     * @property Grid\Column|Collection code
-     * @property Grid\Column|Collection pid
      * @property Grid\Column|Collection agent_product_ids
      * @property Grid\Column|Collection author
      * @property Grid\Column|Collection image
+     * @property Grid\Column|Collection response
+     * @property Grid\Column|Collection pid
      * @property Grid\Column|Collection template
      * @property Grid\Column|Collection end_at
      * @property Grid\Column|Collection start_at
+     * @property Grid\Column|Collection tag
      * @property Grid\Column|Collection bidding_id
      * @property Grid\Column|Collection bidding_user_id
      * @property Grid\Column|Collection bidding_user_type
@@ -110,6 +109,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection publisher_type
      * @property Grid\Column|Collection state
      * @property Grid\Column|Collection demand_id
+     * @property Grid\Column|Collection extends
+     * @property Grid\Column|Collection service_persons
      * @property Grid\Column|Collection connection
      * @property Grid\Column|Collection exception
      * @property Grid\Column|Collection failed_at
@@ -125,9 +126,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection pay_type
      * @property Grid\Column|Collection timeout
      * @property Grid\Column|Collection verify_code
-     * @property Grid\Column|Collection extends
      * @property Grid\Column|Collection min_sale
-     * @property Grid\Column|Collection service_persons
      * @property Grid\Column|Collection verify_mobile
      * @property Grid\Column|Collection create_time
      * @property Grid\Column|Collection developer
@@ -138,20 +137,22 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection user_desc
      * @property Grid\Column|Collection user_version
      * @property Grid\Column|Collection event
-     * @property Grid\Column|Collection response
      * @property Grid\Column|Collection template_id
      * @property Grid\Column|Collection template_type
      * @property Grid\Column|Collection audit_id
      * @property Grid\Column|Collection is_success
      * @property Grid\Column|Collection qrcode
      * @property Grid\Column|Collection order_id
+     * @property Grid\Column|Collection product_spec_id
      * @property Grid\Column|Collection agent_cloud_price
      * @property Grid\Column|Collection coupon_id
+     * @property Grid\Column|Collection info
      * @property Grid\Column|Collection paid_money
      * @property Grid\Column|Collection pay_user_id
      * @property Grid\Column|Collection prepay_price
      * @property Grid\Column|Collection prepay_timeout
      * @property Grid\Column|Collection refund_info
+     * @property Grid\Column|Collection single_price
      * @property Grid\Column|Collection email
      * @property Grid\Column|Collection token
      * @property Grid\Column|Collection access_id
@@ -166,6 +167,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection descr
      * @property Grid\Column|Collection key
      * @property Grid\Column|Collection channels
+     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection money
      * @property Grid\Column|Collection out_trade_no
      * @property Grid\Column|Collection transaction_id
@@ -192,19 +194,12 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection workorder_id
      *
      * @method Grid\Column|Collection disable(string $label = null)
-     * @method Grid\Column|Collection agent_id(string $label = null)
      * @method Grid\Column|Collection created_at(string $label = null)
-     * @method Grid\Column|Collection desc(string $label = null)
+     * @method Grid\Column|Collection detail(string $label = null)
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection name(string $label = null)
-     * @method Grid\Column|Collection picture(string $label = null)
-     * @method Grid\Column|Collection tag(string $label = null)
-     * @method Grid\Column|Collection updated_at(string $label = null)
-     * @method Grid\Column|Collection content(string $label = null)
-     * @method Grid\Column|Collection know(string $label = null)
-     * @method Grid\Column|Collection product_id(string $label = null)
-     * @method Grid\Column|Collection detail(string $label = null)
      * @method Grid\Column|Collection type(string $label = null)
+     * @method Grid\Column|Collection updated_at(string $label = null)
      * @method Grid\Column|Collection version(string $label = null)
      * @method Grid\Column|Collection is_enabled(string $label = null)
      * @method Grid\Column|Collection extension(string $label = null)
@@ -224,7 +219,9 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection password(string $label = null)
      * @method Grid\Column|Collection remember_token(string $label = null)
      * @method Grid\Column|Collection username(string $label = null)
+     * @method Grid\Column|Collection agent_id(string $label = null)
      * @method Grid\Column|Collection display(string $label = null)
+     * @method Grid\Column|Collection picture(string $label = null)
      * @method Grid\Column|Collection sort(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection url(string $label = null)
@@ -232,10 +229,12 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection buy_protocol(string $label = null)
      * @method Grid\Column|Collection reg_protocol(string $label = null)
      * @method Grid\Column|Collection agent_product_id(string $label = null)
+     * @method Grid\Column|Collection product_id(string $label = null)
      * @method Grid\Column|Collection supplier_id(string $label = null)
      * @method Grid\Column|Collection agent_cloud_pid(string $label = null)
      * @method Grid\Column|Collection category_id(string $label = null)
      * @method Grid\Column|Collection channel_id(string $label = null)
+     * @method Grid\Column|Collection content(string $label = null)
      * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection deposit(string $label = null)
      * @method Grid\Column|Collection deposit_timeout(string $label = null)
@@ -245,6 +244,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection guide_price(string $label = null)
      * @method Grid\Column|Collection is_cloud(string $label = null)
      * @method Grid\Column|Collection is_rec(string $label = null)
+     * @method Grid\Column|Collection know(string $label = null)
      * @method Grid\Column|Collection original_price(string $label = null)
      * @method Grid\Column|Collection pictures(string $label = null)
      * @method Grid\Column|Collection price(string $label = null)
@@ -271,14 +271,15 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection mchkey(string $label = null)
      * @method Grid\Column|Collection province_id(string $label = null)
      * @method Grid\Column|Collection rate(string $label = null)
-     * @method Grid\Column|Collection code(string $label = null)
-     * @method Grid\Column|Collection pid(string $label = null)
      * @method Grid\Column|Collection agent_product_ids(string $label = null)
      * @method Grid\Column|Collection author(string $label = null)
      * @method Grid\Column|Collection image(string $label = null)
+     * @method Grid\Column|Collection response(string $label = null)
+     * @method Grid\Column|Collection pid(string $label = null)
      * @method Grid\Column|Collection template(string $label = null)
      * @method Grid\Column|Collection end_at(string $label = null)
      * @method Grid\Column|Collection start_at(string $label = null)
+     * @method Grid\Column|Collection tag(string $label = null)
      * @method Grid\Column|Collection bidding_id(string $label = null)
      * @method Grid\Column|Collection bidding_user_id(string $label = null)
      * @method Grid\Column|Collection bidding_user_type(string $label = null)
@@ -290,6 +291,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection publisher_type(string $label = null)
      * @method Grid\Column|Collection state(string $label = null)
      * @method Grid\Column|Collection demand_id(string $label = null)
+     * @method Grid\Column|Collection extends(string $label = null)
+     * @method Grid\Column|Collection service_persons(string $label = null)
      * @method Grid\Column|Collection connection(string $label = null)
      * @method Grid\Column|Collection exception(string $label = null)
      * @method Grid\Column|Collection failed_at(string $label = null)
@@ -305,9 +308,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection pay_type(string $label = null)
      * @method Grid\Column|Collection timeout(string $label = null)
      * @method Grid\Column|Collection verify_code(string $label = null)
-     * @method Grid\Column|Collection extends(string $label = null)
      * @method Grid\Column|Collection min_sale(string $label = null)
-     * @method Grid\Column|Collection service_persons(string $label = null)
      * @method Grid\Column|Collection verify_mobile(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
      * @method Grid\Column|Collection developer(string $label = null)
@@ -318,20 +319,22 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection user_desc(string $label = null)
      * @method Grid\Column|Collection user_version(string $label = null)
      * @method Grid\Column|Collection event(string $label = null)
-     * @method Grid\Column|Collection response(string $label = null)
      * @method Grid\Column|Collection template_id(string $label = null)
      * @method Grid\Column|Collection template_type(string $label = null)
      * @method Grid\Column|Collection audit_id(string $label = null)
      * @method Grid\Column|Collection is_success(string $label = null)
      * @method Grid\Column|Collection qrcode(string $label = null)
      * @method Grid\Column|Collection order_id(string $label = null)
+     * @method Grid\Column|Collection product_spec_id(string $label = null)
      * @method Grid\Column|Collection agent_cloud_price(string $label = null)
      * @method Grid\Column|Collection coupon_id(string $label = null)
+     * @method Grid\Column|Collection info(string $label = null)
      * @method Grid\Column|Collection paid_money(string $label = null)
      * @method Grid\Column|Collection pay_user_id(string $label = null)
      * @method Grid\Column|Collection prepay_price(string $label = null)
      * @method Grid\Column|Collection prepay_timeout(string $label = null)
      * @method Grid\Column|Collection refund_info(string $label = null)
+     * @method Grid\Column|Collection single_price(string $label = null)
      * @method Grid\Column|Collection email(string $label = null)
      * @method Grid\Column|Collection token(string $label = null)
      * @method Grid\Column|Collection access_id(string $label = null)
@@ -346,6 +349,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection descr(string $label = null)
      * @method Grid\Column|Collection key(string $label = null)
      * @method Grid\Column|Collection channels(string $label = null)
+     * @method Grid\Column|Collection desc(string $label = null)
      * @method Grid\Column|Collection money(string $label = null)
      * @method Grid\Column|Collection out_trade_no(string $label = null)
      * @method Grid\Column|Collection transaction_id(string $label = null)
@@ -377,19 +381,12 @@ namespace Dcat\Admin {
 
     /**
      * @property Show\Field|Collection disable
-     * @property Show\Field|Collection agent_id
      * @property Show\Field|Collection created_at
-     * @property Show\Field|Collection desc
+     * @property Show\Field|Collection detail
      * @property Show\Field|Collection id
      * @property Show\Field|Collection name
-     * @property Show\Field|Collection picture
-     * @property Show\Field|Collection tag
-     * @property Show\Field|Collection updated_at
-     * @property Show\Field|Collection content
-     * @property Show\Field|Collection know
-     * @property Show\Field|Collection product_id
-     * @property Show\Field|Collection detail
      * @property Show\Field|Collection type
+     * @property Show\Field|Collection updated_at
      * @property Show\Field|Collection version
      * @property Show\Field|Collection is_enabled
      * @property Show\Field|Collection extension
@@ -409,7 +406,9 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection password
      * @property Show\Field|Collection remember_token
      * @property Show\Field|Collection username
+     * @property Show\Field|Collection agent_id
      * @property Show\Field|Collection display
+     * @property Show\Field|Collection picture
      * @property Show\Field|Collection sort
      * @property Show\Field|Collection status
      * @property Show\Field|Collection url
@@ -417,10 +416,12 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection buy_protocol
      * @property Show\Field|Collection reg_protocol
      * @property Show\Field|Collection agent_product_id
+     * @property Show\Field|Collection product_id
      * @property Show\Field|Collection supplier_id
      * @property Show\Field|Collection agent_cloud_pid
      * @property Show\Field|Collection category_id
      * @property Show\Field|Collection channel_id
+     * @property Show\Field|Collection content
      * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection deposit
      * @property Show\Field|Collection deposit_timeout
@@ -430,6 +431,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection guide_price
      * @property Show\Field|Collection is_cloud
      * @property Show\Field|Collection is_rec
+     * @property Show\Field|Collection know
      * @property Show\Field|Collection original_price
      * @property Show\Field|Collection pictures
      * @property Show\Field|Collection price
@@ -456,14 +458,15 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection mchkey
      * @property Show\Field|Collection province_id
      * @property Show\Field|Collection rate
-     * @property Show\Field|Collection code
-     * @property Show\Field|Collection pid
      * @property Show\Field|Collection agent_product_ids
      * @property Show\Field|Collection author
      * @property Show\Field|Collection image
+     * @property Show\Field|Collection response
+     * @property Show\Field|Collection pid
      * @property Show\Field|Collection template
      * @property Show\Field|Collection end_at
      * @property Show\Field|Collection start_at
+     * @property Show\Field|Collection tag
      * @property Show\Field|Collection bidding_id
      * @property Show\Field|Collection bidding_user_id
      * @property Show\Field|Collection bidding_user_type
@@ -475,6 +478,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection publisher_type
      * @property Show\Field|Collection state
      * @property Show\Field|Collection demand_id
+     * @property Show\Field|Collection extends
+     * @property Show\Field|Collection service_persons
      * @property Show\Field|Collection connection
      * @property Show\Field|Collection exception
      * @property Show\Field|Collection failed_at
@@ -490,9 +495,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection pay_type
      * @property Show\Field|Collection timeout
      * @property Show\Field|Collection verify_code
-     * @property Show\Field|Collection extends
      * @property Show\Field|Collection min_sale
-     * @property Show\Field|Collection service_persons
      * @property Show\Field|Collection verify_mobile
      * @property Show\Field|Collection create_time
      * @property Show\Field|Collection developer
@@ -503,20 +506,22 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection user_desc
      * @property Show\Field|Collection user_version
      * @property Show\Field|Collection event
-     * @property Show\Field|Collection response
      * @property Show\Field|Collection template_id
      * @property Show\Field|Collection template_type
      * @property Show\Field|Collection audit_id
      * @property Show\Field|Collection is_success
      * @property Show\Field|Collection qrcode
      * @property Show\Field|Collection order_id
+     * @property Show\Field|Collection product_spec_id
      * @property Show\Field|Collection agent_cloud_price
      * @property Show\Field|Collection coupon_id
+     * @property Show\Field|Collection info
      * @property Show\Field|Collection paid_money
      * @property Show\Field|Collection pay_user_id
      * @property Show\Field|Collection prepay_price
      * @property Show\Field|Collection prepay_timeout
      * @property Show\Field|Collection refund_info
+     * @property Show\Field|Collection single_price
      * @property Show\Field|Collection email
      * @property Show\Field|Collection token
      * @property Show\Field|Collection access_id
@@ -531,6 +536,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection descr
      * @property Show\Field|Collection key
      * @property Show\Field|Collection channels
+     * @property Show\Field|Collection desc
      * @property Show\Field|Collection money
      * @property Show\Field|Collection out_trade_no
      * @property Show\Field|Collection transaction_id
@@ -557,19 +563,12 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection workorder_id
      *
      * @method Show\Field|Collection disable(string $label = null)
-     * @method Show\Field|Collection agent_id(string $label = null)
      * @method Show\Field|Collection created_at(string $label = null)
-     * @method Show\Field|Collection desc(string $label = null)
+     * @method Show\Field|Collection detail(string $label = null)
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection name(string $label = null)
-     * @method Show\Field|Collection picture(string $label = null)
-     * @method Show\Field|Collection tag(string $label = null)
-     * @method Show\Field|Collection updated_at(string $label = null)
-     * @method Show\Field|Collection content(string $label = null)
-     * @method Show\Field|Collection know(string $label = null)
-     * @method Show\Field|Collection product_id(string $label = null)
-     * @method Show\Field|Collection detail(string $label = null)
      * @method Show\Field|Collection type(string $label = null)
+     * @method Show\Field|Collection updated_at(string $label = null)
      * @method Show\Field|Collection version(string $label = null)
      * @method Show\Field|Collection is_enabled(string $label = null)
      * @method Show\Field|Collection extension(string $label = null)
@@ -589,7 +588,9 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection password(string $label = null)
      * @method Show\Field|Collection remember_token(string $label = null)
      * @method Show\Field|Collection username(string $label = null)
+     * @method Show\Field|Collection agent_id(string $label = null)
      * @method Show\Field|Collection display(string $label = null)
+     * @method Show\Field|Collection picture(string $label = null)
      * @method Show\Field|Collection sort(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection url(string $label = null)
@@ -597,10 +598,12 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection buy_protocol(string $label = null)
      * @method Show\Field|Collection reg_protocol(string $label = null)
      * @method Show\Field|Collection agent_product_id(string $label = null)
+     * @method Show\Field|Collection product_id(string $label = null)
      * @method Show\Field|Collection supplier_id(string $label = null)
      * @method Show\Field|Collection agent_cloud_pid(string $label = null)
      * @method Show\Field|Collection category_id(string $label = null)
      * @method Show\Field|Collection channel_id(string $label = null)
+     * @method Show\Field|Collection content(string $label = null)
      * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection deposit(string $label = null)
      * @method Show\Field|Collection deposit_timeout(string $label = null)
@@ -610,6 +613,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection guide_price(string $label = null)
      * @method Show\Field|Collection is_cloud(string $label = null)
      * @method Show\Field|Collection is_rec(string $label = null)
+     * @method Show\Field|Collection know(string $label = null)
      * @method Show\Field|Collection original_price(string $label = null)
      * @method Show\Field|Collection pictures(string $label = null)
      * @method Show\Field|Collection price(string $label = null)
@@ -636,14 +640,15 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection mchkey(string $label = null)
      * @method Show\Field|Collection province_id(string $label = null)
      * @method Show\Field|Collection rate(string $label = null)
-     * @method Show\Field|Collection code(string $label = null)
-     * @method Show\Field|Collection pid(string $label = null)
      * @method Show\Field|Collection agent_product_ids(string $label = null)
      * @method Show\Field|Collection author(string $label = null)
      * @method Show\Field|Collection image(string $label = null)
+     * @method Show\Field|Collection response(string $label = null)
+     * @method Show\Field|Collection pid(string $label = null)
      * @method Show\Field|Collection template(string $label = null)
      * @method Show\Field|Collection end_at(string $label = null)
      * @method Show\Field|Collection start_at(string $label = null)
+     * @method Show\Field|Collection tag(string $label = null)
      * @method Show\Field|Collection bidding_id(string $label = null)
      * @method Show\Field|Collection bidding_user_id(string $label = null)
      * @method Show\Field|Collection bidding_user_type(string $label = null)
@@ -655,6 +660,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection publisher_type(string $label = null)
      * @method Show\Field|Collection state(string $label = null)
      * @method Show\Field|Collection demand_id(string $label = null)
+     * @method Show\Field|Collection extends(string $label = null)
+     * @method Show\Field|Collection service_persons(string $label = null)
      * @method Show\Field|Collection connection(string $label = null)
      * @method Show\Field|Collection exception(string $label = null)
      * @method Show\Field|Collection failed_at(string $label = null)
@@ -670,9 +677,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection pay_type(string $label = null)
      * @method Show\Field|Collection timeout(string $label = null)
      * @method Show\Field|Collection verify_code(string $label = null)
-     * @method Show\Field|Collection extends(string $label = null)
      * @method Show\Field|Collection min_sale(string $label = null)
-     * @method Show\Field|Collection service_persons(string $label = null)
      * @method Show\Field|Collection verify_mobile(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
      * @method Show\Field|Collection developer(string $label = null)
@@ -683,20 +688,22 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection user_desc(string $label = null)
      * @method Show\Field|Collection user_version(string $label = null)
      * @method Show\Field|Collection event(string $label = null)
-     * @method Show\Field|Collection response(string $label = null)
      * @method Show\Field|Collection template_id(string $label = null)
      * @method Show\Field|Collection template_type(string $label = null)
      * @method Show\Field|Collection audit_id(string $label = null)
      * @method Show\Field|Collection is_success(string $label = null)
      * @method Show\Field|Collection qrcode(string $label = null)
      * @method Show\Field|Collection order_id(string $label = null)
+     * @method Show\Field|Collection product_spec_id(string $label = null)
      * @method Show\Field|Collection agent_cloud_price(string $label = null)
      * @method Show\Field|Collection coupon_id(string $label = null)
+     * @method Show\Field|Collection info(string $label = null)
      * @method Show\Field|Collection paid_money(string $label = null)
      * @method Show\Field|Collection pay_user_id(string $label = null)
      * @method Show\Field|Collection prepay_price(string $label = null)
      * @method Show\Field|Collection prepay_timeout(string $label = null)
      * @method Show\Field|Collection refund_info(string $label = null)
+     * @method Show\Field|Collection single_price(string $label = null)
      * @method Show\Field|Collection email(string $label = null)
      * @method Show\Field|Collection token(string $label = null)
      * @method Show\Field|Collection access_id(string $label = null)
@@ -711,6 +718,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection descr(string $label = null)
      * @method Show\Field|Collection key(string $label = null)
      * @method Show\Field|Collection channels(string $label = null)
+     * @method Show\Field|Collection desc(string $label = null)
      * @method Show\Field|Collection money(string $label = null)
      * @method Show\Field|Collection out_trade_no(string $label = null)
      * @method Show\Field|Collection transaction_id(string $label = null)
@@ -747,7 +755,7 @@ namespace Dcat\Admin {
 
 namespace Dcat\Admin\Grid {
     /**
-
+     
      */
     class Column {}
 
@@ -759,7 +767,7 @@ namespace Dcat\Admin\Grid {
 
 namespace Dcat\Admin\Show {
     /**
-
+     
      */
     class Field {}
 }

resources/lang/zh_CN/deposit-log.php

@@ -0,0 +1,14 @@
+<?php
+return [
+    'labels' => [
+        'DepositLog' => '交易金流水',
+        'deposit-log' => '交易金流水',
+    ],
+    'fields' => [
+        'price' => '变更价格',
+        'supplier_id' => '供应商id',
+        'type' => '类型 1正常 2 冻结 3消费',
+    ],
+    'options' => [
+    ],
+];