Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/DepositController.php

@@ -0,0 +1,62 @@
+<?php
+
+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
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Supplier(), function (Grid $grid) {
+			$grid->disableDeleteButton();
+			$grid->disableCreateButton();
+			$grid->disableRowSelector();
+			$grid->disableViewButton();
+			$grid->column('id')->sortable();
+			$grid->column('name');
+			$grid->column('deposit_normal','正常');
+			$grid->column('deposit_frozen','冻结中');
+			$grid->column('deposit_used','已消费');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    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->disableCreatingCheck();
+			$form->disableViewButton();
+			$form->disableDeleteButton();
+			$form->disableListButton();
+			$form->disableResetButton();
+			$form->disableViewCheck();
+			$form->disableEditingCheck();
+		});
+    }
+}

app/Admin/Metrics/Examples/AgentStatistics.php

@@ -77,7 +77,7 @@ class AgentStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/Admin/Metrics/Examples/OrderStatistics.php

@@ -74,7 +74,7 @@ class OrderStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/Admin/Metrics/Examples/ProductStatistics.php

@@ -70,7 +70,7 @@ class ProductStatistics extends Chart
 			->select('*');
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 		switch (request('time_key', 0)) {
 			case '1':

app/Admin/Metrics/Examples/SupplierStatistics.php

@@ -78,7 +78,7 @@ class SupplierStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/Admin/routes.php

@@ -45,4 +45,5 @@ Route::group([
 
 	$router->resource('withdrawal', 'WithdrawalController');
 	$router->resource('system', 'SystemSettingController');
+	$router->resource('deposit', 'DepositController');
 });

app/AdminAgent/Metrics/Examples/FinanceStatistics.php

@@ -76,7 +76,7 @@ class FinanceStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/AdminAgent/Metrics/Examples/OrderStatistics.php

@@ -75,7 +75,7 @@ class OrderStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/AdminAgent/Metrics/Examples/ProductStatistics.php

@@ -71,7 +71,7 @@ class ProductStatistics extends Chart
 			->select('*');
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 		switch (request('time_key', 0)) {
 			case '1':

app/AdminSupplier/Metrics/Examples/FinanceStatistics.php

@@ -79,7 +79,7 @@ class FinanceStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/AdminSupplier/Metrics/Examples/OrderStatistics.php

@@ -76,7 +76,7 @@ class OrderStatistics extends Chart
 
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 
 		switch (request('time_key', 0)) {

app/AdminSupplier/Metrics/Examples/ProductStatistics.php

@@ -72,7 +72,7 @@ class ProductStatistics extends Chart
 			->select('*');
 		$dateTime = request('created_at', 0);
 		if ($dateTime) {
-			$query->whereBetween('created_at',$dateTime);
+			$query->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']);
 		}
 		switch (request('time_key', 0)) {
 			case '1':

resources/lang/zh_CN/global.php

@@ -35,6 +35,8 @@ return [
 		'my_bidding_product' => '竞标产品库',
 		'demand_product'=> '产品管理',
 		'MyBiddingProduct' => '竞标产品库',
+		'deposit' => '交易金',
+		'Deposit' => '交易金'
     ],
     'options' => [
         //