Merge remote-tracking branch 'origin/master'

MySQL_change.sql

@@ -1,6 +1,6 @@
 # 16:37 2021/9/16
 ALTER TABLE `products`
-	ADD COLUMN `service_persons` INT NOT NULL DEFAULT '1' COMMENT '涉及用户数' AFTER `content`;
+	ADD COLUMN `service_persons` INT NOT NULL DEFAULT '1' COMMENT '单库存服务用户数' AFTER `content`;
 
 # 17:49 2021/9/17
 ALTER TABLE `suppliers`
@@ -54,7 +54,7 @@ CREATE TABLE `industry_products` (
 	`status` TINYINT(3) NOT NULL DEFAULT '0' COMMENT '-2:下架，-1:审核拒绝，0:未审核，1:上架',
 	`know` TEXT NULL DEFAULT NULL COMMENT '旅客须知' COLLATE 'utf8_general_ci',
 	`content` MEDIUMTEXT NULL DEFAULT NULL COMMENT '产品详情' COLLATE 'utf8_general_ci',
-	`service_persons` INT(10) NOT NULL DEFAULT '1' COMMENT '涉及用户数',
+	`service_persons` INT(10) NOT NULL DEFAULT '1' COMMENT '单库存服务用户数',
 	`min_sale` INT(10) NOT NULL DEFAULT '0' COMMENT '起售数',
 	`verify_mobile` VARCHAR(15) NOT NULL DEFAULT '' COMMENT '核销人员手机号' COLLATE 'utf8mb4_unicode_ci',
 	`extends` JSON NULL DEFAULT NULL,

app/Admin/Controllers/IndustryOrderController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Extensions\Grid\IndustryOrderStatus;
+use App\Admin\Repositories\IndustryOrder;
+use App\Common\OrderStatus;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class IndustryOrderController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new IndustryOrder(['agent:id,name']), function (Grid $grid) {
+			$grid->disableCreateButton();
+			$grid->disableRowSelector();
+			$grid->disableActions();
+
+        	//$grid->model()->where('supplier_id', Admin::user()->id);
+
+            $grid->column('id')->sortable();
+            $grid->column('agent.name', '代理商名称');
+            $grid->column('order_no');
+            $grid->column('num');
+            $grid->column('price');
+            $grid->column('name');
+            $grid->column('mobile');
+			$grid->column('industry_product_id', '产品ID');
+            $grid->column('title');
+            $grid->column('picture')->image('', 60, 60);
+			$grid->column('status')
+				->using(OrderStatus::array());
+            $grid->column('paid_at');
+//            $grid->column('timeout');
+            $grid->column('created_at');
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id')->width(2);
+				$filter->equal('order_no')->width(3);
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        /*return Show::make($id, new IndustryOrder(), function (Show $show) {
+            $show->field('id');
+            $show->field('agent_id');
+            $show->field('supplier_id');
+            $show->field('order_no');
+            $show->field('industry_product_id');
+            $show->field('num');
+            $show->field('price');
+            $show->field('name');
+            $show->field('mobile');
+            $show->field('title');
+            $show->field('picture');
+            $show->field('status');
+            $show->field('paid_at');
+            $show->field('verify_code');
+            $show->field('timeout');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });*/
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new IndustryOrder(), function (Form $form) {
+            $form->display('id');
+//            $form->select('status')->options([OrderStatus::OFFLINE_PAID => '已付款']);
+        })->saving(function(Form $form) {
+        	return $form->response()->error('操作禁止');
+		})->deleting(function(Form $form) {
+			return $form->response()->error('操作禁止');
+		});
+    }
+}

app/Admin/Repositories/IndustryOrder.php

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

app/Admin/routes.php

@@ -45,7 +45,7 @@ Route::group([
 	$router->resource('mini_program/draft', 'MiniProgramDraftController');
 	$router->resource('mini_program/template', 'MiniProgramTemplateController');
 	$router->resource('mini_program/list', 'MiniProgramListController');
-
+	$router->resource('industry_order/list', 'IndustryOrderController');
 	$router->resource('withdrawal', 'WithdrawalController');
 	$router->resource('system', 'SystemSettingController');
 	$router->resource('deposit', 'DepositController');

app/AdminAgent/Controllers/IndustryOrderController.php

@@ -151,7 +151,7 @@ class IndustryOrderController extends AdminController
 			$form->text('', '购买产品')->default($industry->title)->disable();
 			$form->text('', '单价')->default($industry->price)->disable();
 			$form->text('', '库存')->default($industry->stock)->disable();
-			$form->text('', '涉及用户数')->default($industry->service_persons)->disable();
+			$form->text('', '单库存服务用户数')->default($industry->service_persons)->disable();
 			$form->text('', '起购数量')->default($industry->min_sale)->disable();
 			$form->image('picture', '产品图')->default($industry->pictures)->disable();
         })->saving(function (Form $form) use ($industry) {

app/AdminSupplier/Controllers/DemandProductController.php

@@ -63,7 +63,7 @@ class DemandProductController extends AdminController
 			$show->field('category.name','分类');
 			$show->field('title');
 			$show->field('pictures')->image('', 80, 80);
-			$show->field('service_persons','涉及用户数');
+			$show->field('service_persons','单库存服务用户数');
 			$show->field('status')->using(ProductStatus::array());
 			$show->field('know')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
 			$show->field('content')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
@@ -94,7 +94,7 @@ class DemandProductController extends AdminController
 			$form->text('title')->required();
 			//$form->currency('price')->symbol('￥')->required();
 			//$form->currency('original_price')->symbol('￥')->required();
-			$form->number('service_persons','涉及用户数')->required();
+			$form->number('service_persons','单库存服务用户数')->required();
 			//$form->number('stock')->required();
 			$form->multipleImage('pictures')->required()->removable(false)->retainable()->uniqueName();
 			$form->editor('know');

resources/lang/zh_CN/global.php

@@ -36,7 +36,33 @@ return [
 		'demand_product'=> '产品管理',
 		'MyBiddingProduct' => '竞标产品库',
 		'deposit' => '交易金',
-		'Deposit' => '交易金'
+		'Deposit' => '交易金',
+		'audit' => '审核',
+		'Audit' => '审核',
+		'Order_statistics' => '订单统计',
+		'order_statistics' => '订单统计',
+		'User_statistics' => '用户统计',
+		'user_statistics' => '用户统计',
+		'Product_statistics' => '商品统计',
+		'product_statistics' => '商品统计',
+		'Agent_statistics' => '代理商统计',
+		'agent_statistics' => '代理商统计	',
+		'Supplier_statistics' => '供应商统计',
+		'supplier_statistics' => '供应商统计	',
+		'Setting_single' => '交易设置',
+		'setting_single' => '交易设置',
+		'Template' => '模版',
+		'template' => '模版',
+		'product' => '产品',
+		'Product' => '产品',
+		'Workorder_item' => '工单详情',
+		'workorder_item' => '工单详情',
+		'Wallet' => '提现',
+		'wallet' => '提现',
+		'Supplier_info' => '供应商信息',
+		'supplier_info' => '供应商信息',
+		'Deposit_log' => '交易金流水',
+		'deposit_log' => '交易金流水',
     ],
     'options' => [
         //

resources/lang/zh_CN/product.php

@@ -13,7 +13,7 @@ return [
         'picture' => '产品图片',
         'price' => '售价',
         'sale' => '销量',
-        'service_persons' => '涉及用户数',
+        'service_persons' => '单库存服务用户数',
         'status' => '状态',
         'stock' => '库存',
         'supplier_id' => '供应商ID',

resources/lang/zh_CN/system-setting.php

@@ -0,0 +1,15 @@
+<?php
+return [
+    'labels' => [
+        'System' => '提现设置',
+        'system' => '提现设置',
+    ],
+    'fields' => [
+        'withdrawal_id' => '提现主表',
+        'account' => '账户',
+        'name' => '真实姓名',
+        'qrcode' => '收款码',
+    ],
+    'options' => [
+    ],
+];