From 9e8cccbbd03b46a2cd940d35211ca4bd2b97384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Mon, 20 Feb 2023 10:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=88=A0=E9=99=A4=E6=97=B6?= =?UTF-8?q?=E5=80=99=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7=E6=96=87=E5=AD=97?= =?UTF-8?q?=E9=99=90=E5=88=B68=E4=B8=AA=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php | 5 +---- crmeb/app/services/agent/AgentLevelServices.php | 4 ++-- crmeb/app/services/order/StoreOrderComputedServices.php | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php index 224484e32..ce01afc52 100644 --- a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php +++ b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php @@ -106,10 +106,7 @@ class StoreSeckill extends AuthController $storeProductAttrValueServices = app()->make(StoreProductAttrValueServices::class); $unique = $storeProductAttrValueServices->value(['product_id' => $id, 'type' => 1], 'unique'); if ($unique) { - $name = 'seckill_' . $unique . '_1'; - /** @var CacheService $cache */ - $cache = app()->make(CacheService::class); - $cache->del($name); + CacheService::delete('seckill_' . $unique . '_1'); } return app('json')->success(100002); } diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php index 498d79c1f..ba9258ae0 100644 --- a/crmeb/app/services/agent/AgentLevelServices.php +++ b/crmeb/app/services/agent/AgentLevelServices.php @@ -256,7 +256,7 @@ class AgentLevelServices extends BaseServices */ public function createForm() { - $field[] = Form::input('name', '等级名称')->col(24); + $field[] = Form::input('name', '等级名称')->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', 0)->min(0)->precision(0); $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::number('one_brokerage', '一级上浮', 0)->info('在分销一级佣金基础上浮(0-1000之间整数)百分比')->min(0)->max(1000)->precision(0); @@ -278,7 +278,7 @@ class AgentLevelServices extends BaseServices throw new AdminException(100026); $field = []; $field[] = Form::hidden('id', $id); - $field[] = Form::input('name', '等级名称', $levelInfo['name'])->col(24); + $field[] = Form::input('name', '等级名称', $levelInfo['name'])->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', $levelInfo['grade'])->min(0)->precision(0); $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $levelInfo['image'])->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::number('one_brokerage', '一级上浮', $levelInfo['one_brokerage'])->info('在分销一级佣金基础上浮(0-1000之间整数)百分比')->min(0)->max(1000)->precision(0); diff --git a/crmeb/app/services/order/StoreOrderComputedServices.php b/crmeb/app/services/order/StoreOrderComputedServices.php index bff185d68..a2e1e55dd 100644 --- a/crmeb/app/services/order/StoreOrderComputedServices.php +++ b/crmeb/app/services/order/StoreOrderComputedServices.php @@ -82,11 +82,6 @@ class StoreOrderComputedServices extends BaseServices $offlinePayStatus = (int)sys_config('offline_pay_status') ?? (int)2; $systemPayType = PayServices::PAY_TYPE; if ($offlinePayStatus == 2) unset($systemPayType['offline']); - if (strtolower($payType) != 'pc' && strtolower($payType) != 'friend') { - if (!array_key_exists($payType, $systemPayType)) { - throw new ApiException(410241); - } - } if (!$userInfo) { /** @var UserServices $userServices */ $userServices = app()->make(UserServices::class);