From 692ec0c3cb126ff86f6426e28fa1fc0eba0d35c0 Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 1 Sep 2021 17:20:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=A1=E7=AE=97=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/OrderController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index f63d90b..1535817 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -177,8 +177,8 @@ class OrderController extends Controller } else if ($formData['pay_type'] == PayType::EARNEST_PAY && $ap->earnest_timeout > 0) { $timeout = date('Y-m-d H:i:s', time() + $ap->earnest_timeout * 60); } else { - $order_timeout = AgentSetting::val($this->agent_id, 'order_timeout') ?? 60; - $timeout = date('Y-m-d H:i:s', time() + $ap->earnest_timeout * $order_timeout); + $order_timeout = AgentSetting::val($this->agent_id, 'order_timeout') ?? 60; //默认60分钟 + $timeout = date('Y-m-d H:i:s', time() + 60 * $order_timeout); //60 * 分钟转为秒 } // 存入订单表 From 49f3d741a5f2579401212d102829b91987c7880b Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 1 Sep 2021 17:27:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=BAerror?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/AgentProductController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 58a0845..49a2f9f 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -249,7 +249,7 @@ class AgentProductController extends AdminController $count = Product::where([['status', '=', ProductStatus::ON_SALE], ['stock', '>=', $form->model()->stock]]) ->whereIn('id', $ids)->count(); if (count($ids) != $count) { - return $form->response()->success('供应商产品已下架或库存不足！'); + return $form->response()->error('供应商产品已下架或库存不足！'); } //修改库存 From 24ee0442fc1ab515a0b91c2cf2c976562cd60551 Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 1 Sep 2021 18:42:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E6=97=B6=E6=8F=90=E7=A4=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/AgentProductController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 49a2f9f..f862210 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -283,7 +283,7 @@ class AgentProductController extends AdminController if ($product->status != ProductStatus::ON_SALE) { return $form->response()->error('产品ID '. $form->product_id .' 已下架'); } else if ($product->stock < $form->stock) { - return $form->response()->error("供应商当前库存为{$form->stock}，你设置的库存不能超过该数值"); + return $form->response()->error("供应商当前库存为{$product->stock}，你设置的库存不能超过该数值"); } $form->title = $product->title; $form->pictures = $product->pictures; From 9fc517f27d5029d20901ba30cb897c992070696f Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 1 Sep 2021 18:43:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=A7=E5=93=81=E5=90=8C=E6=AD=A5=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=B0=E4=BB=A3=E7=90=86=E5=95=86=E4=BA=A7?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ProductController.php | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index e6f0ca8..b22a0b0 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -38,7 +38,7 @@ class ProductController extends AdminController $grid->column('stock'); $grid->column('sale'); $grid->column('status')->using(ProductStatus::array()); - $grid->column('verify_mobile','核销号码'); + $grid->column('verify_mobile','核销员手机'); $grid->column('created_at'); $grid->column('updated_at'); @@ -71,7 +71,7 @@ class ProductController extends AdminController $show->field('status'); $show->field('know')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('content')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); - $show->field('verify_mobile','核销号码'); + $show->field('verify_mobile','核销员手机'); $show->field('created_at'); $show->field('updated_at'); }); @@ -101,9 +101,9 @@ class ProductController extends AdminController $form->text('stock')->default(9999)->required(); $form->editor('know'); $form->editor('content')->required(); - $form->text('verify_mobile','核销号码'); + $form->text('verify_mobile','核销员手机'); if ($form->isEditing()) { - $form->confirm('提示', '编辑产品需要重新审核，同时下架所有关联的代理商产品，是否继续？'); + $form->confirm('提示', '修改标题、价格、产品图片、旅游须知、产品详情需要重新审核，同时下架所有关联的代理商产品，是否继续？'); } })->saving(function (Form $form) { //不允许编辑非自己数据 @@ -111,7 +111,7 @@ class ProductController extends AdminController return $form->response()->error('数据不存在'); } - //不允许编辑的字段 TODO 忽略字段不起作用 + //不允许编辑的字段，忽略字段不起作用？ $form->ignore(['id', 'supplier_id', 'sale', 'status', 'created_at', 'updated_at', 'deleted_at']); //null字段转为'' @@ -122,16 +122,38 @@ class ProductController extends AdminController } //特殊字段处理 - $form->hidden(['status', 'supplier_id']); //表单没有的字段，必须加上这句才能重置值 - $form->status = ProductStatus::UNAUDITED; + $form->hidden('supplier_id'); //表单没有的字段，必须加上这句才能重置值 $form->supplier_id = Admin::user()->id; })->saved(function (Form $form, $result) { - //下架代理商产品 - $id = $form->getKey(); - if ($result) { - AgentProduct::where('product_id', $id) - ->orWhere(DB::raw('FIND_IN_SET(' . $id . ', product_ids)')) //TODO product_ids字段可能会去掉 - ->update(['status' => ProductStatus::SOLD_OUT]); + if ($form->isEditing() && $result) { + $ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray(); + + DB::beginTransaction(); + try { + $data = [ + 'title' => $form->title, + 'pictures' => explode(',', $form->pictures), + 'know' => $form->know, + 'content' => $form->content, + ]; + + //如果修改标题、价格、产品图片、旅游须知、产品详情，状态将变为未审核 + if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) { + $form->model()->update(['status' => ProductStatus::UNAUDITED]); + + //下架所有代理商产品 + $data['status'] = ProductStatus::SOLD_OUT; + } + + //同步信息到代理商产品，注：组合产品不同步 + AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update($data); + + DB::commit(); + return $form->response()->success('更新成功！'); + } catch (\Exception $exception) { + DB::rollBack(); + return $form->response()->error($exception->getMessage()); + } } })->deleting(function (Form $form) { //不允许删除非自己的数据 From cd9f6d2121b17c1f59d5a929981dce73515b2304 Mon Sep 17 00:00:00 2001 From: liapples Date: Thu, 2 Sep 2021 10:06:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ProductController.php | 14 +++++++++ .../Controllers/ProductController.php | 29 ++++++++++--------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/app/Admin/Controllers/ProductController.php b/app/Admin/Controllers/ProductController.php index 2d43892..713da99 100644 --- a/app/Admin/Controllers/ProductController.php +++ b/app/Admin/Controllers/ProductController.php @@ -6,6 +6,8 @@ use App\Admin\Extensions\Grid\AuditProduct; use App\Admin\Repositories\Product; use App\Common\ProductStatus; use App\Common\UserStatus; +use App\Models\AgentProduct; +use App\Models\AgentProductItem; use App\Models\Category; use App\Models\Supplier; use Dcat\Admin\Form; @@ -138,6 +140,18 @@ class ProductController extends AdminController $form->$k = ''; } } + })->saved(function(Form $form) { + //如果是审核的产品，将产品同步到代理商产品 + if ($form->isEditing() && $form->status == ProductStatus::ON_SALE) { + $ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray(); + //同步信息到代理商产品，注：组合产品不同步 + AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update([ + 'title' => $form->title, + 'pictures' => explode(',', $form->pictures), + 'know' => $form->know, + 'content' => $form->content, + ]); + } }); } } diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index b22a0b0..c6d72ef 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -122,34 +122,35 @@ class ProductController extends AdminController } //特殊字段处理 - $form->hidden('supplier_id'); //表单没有的字段，必须加上这句才能重置值 + $form->hidden(['status', 'supplier_id']); //表单没有的字段，必须加上这句才能重置值 $form->supplier_id = Admin::user()->id; + if ($form->isCreating()) { + $form->status = ProductStatus::UNAUDITED; + } })->saved(function (Form $form, $result) { if ($form->isEditing() && $result) { $ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray(); DB::beginTransaction(); try { - $data = [ - 'title' => $form->title, - 'pictures' => explode(',', $form->pictures), - 'know' => $form->know, - 'content' => $form->content, - ]; - //如果修改标题、价格、产品图片、旅游须知、产品详情，状态将变为未审核 if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) { $form->model()->update(['status' => ProductStatus::UNAUDITED]); - //下架所有代理商产品 - $data['status'] = ProductStatus::SOLD_OUT; + //下架所有代理商产品，未审核的产品，不能同步信息到代理商产品 + AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update(['status' => ProductStatus::SOLD_OUT]); + } else { + //不需要审核的修改信息同步信息到代理商产品，注：组合产品不同步 + AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update([ + 'title' => $form->title, + 'pictures' => explode(',', $form->pictures), + 'know' => $form->know, + 'content' => $form->content, + ]); } - //同步信息到代理商产品，注：组合产品不同步 - AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update($data); - DB::commit(); - return $form->response()->success('更新成功！'); + return $form->response()->success('更新成功！')->script('history.go(-1)'); } catch (\Exception $exception) { DB::rollBack(); return $form->response()->error($exception->getMessage()); From 9bd4e129921715e01e490b2e1b8a4e7a9c175e20 Mon Sep 17 00:00:00 2001 From: liapples Date: Thu, 2 Sep 2021 10:19:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/AgentProduct.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Models/AgentProduct.php b/app/Models/AgentProduct.php index 6b03135..a8c4d7f 100644 --- a/app/Models/AgentProduct.php +++ b/app/Models/AgentProduct.php @@ -54,23 +54,17 @@ class AgentProduct extends BaseModel public function setChannelIdAttribute($value) { - if (is_array($value)) { - $this->attributes['channel_id'] = join(',', array_filter($value)); - } + $this->attributes['channel_id'] = is_array($value) ? join(',', array_filter($value)) : $value; } public function setPicturesAttribute($value) { - if (is_array($value)) { - $this->attributes['pictures'] = json_encode(array_filter($value)) ?? ''; - } + $this->attributes['pictures'] = is_array($value) ? (json_encode(array_filter($value)) ?? '[]') : '[]'; } public function setProductIdsAttribute($value) { - if (is_array($value)) { - $this->attributes['product_ids'] = join(',', array_filter($value)); - } + $this->attributes['product_ids'] = is_array($value) ? join(',', array_filter($value)) : $value; } // 获取所有产品图片