From c4f921f0c5d45c935ddfdd1868dd5049960506ff Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 28 Apr 2023 10:37:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=AE=A2=E6=9C=8D=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/api/controller/v1/order/StoreOrderController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index fc166831d..613d27b48 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -291,10 +291,12 @@ class StoreOrderController return app('json')->status('pay_error', $pay); } case PayServices::OFFLINE_PAY: - if ($this->services->setOrderTypePayOffline($order['order_id'])) + if ($this->services->setOrderTypePayOffline($order['order_id'])) { + event('NoticeListener', [$order, 'admin_pay_success_code']); return app('json')->status('success', 410203); - else + } else { return app('json')->status('success', 410216); + } default: $payInfo = $payServices->beforePay($order->toArray(), $paytype, ['quitUrl' => $quitUrl]); return app('json')->status($payInfo['status'], $payInfo['payInfo']); From 2076019eb2d4d4715d9f3b2043614f51dfe1b3c1 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 28 Apr 2023 10:37:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=90=8C=E6=AD=A5=E6=96=87=E4=BB=B6=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/log/SystemFileInfoServices.php | 2 +- crmeb/crmeb/command/Util.php | 27 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/crmeb/app/services/system/log/SystemFileInfoServices.php b/crmeb/app/services/system/log/SystemFileInfoServices.php index abb876cc6..af88e1051 100644 --- a/crmeb/app/services/system/log/SystemFileInfoServices.php +++ b/crmeb/app/services/system/log/SystemFileInfoServices.php @@ -25,7 +25,7 @@ class SystemFileInfoServices extends BaseServices public function syncfile() { $list = $this->flattenArray($this->scanDirectory()); -// $this->dao->saveAll($list); + $this->dao->saveAll($list); } public function scanDirectory($dir = '') diff --git a/crmeb/crmeb/command/Util.php b/crmeb/crmeb/command/Util.php index e32ec9a44..0740a2220 100644 --- a/crmeb/crmeb/command/Util.php +++ b/crmeb/crmeb/command/Util.php @@ -73,20 +73,25 @@ class Util extends Command $valueJosn = str_replace('https://', 'https:\\\/\\\/', $valueJosn); $prefix = Config::get('database.connections.' . Config::get('database.default') . '.prefix'); $sql = [ - "UPDATE `{$prefix}system_attachment` SET `att_dir` = replace(att_dir ,'{$siteUrl}','{$url}'),`satt_dir` = replace(satt_dir ,'{$siteUrl}','{$url}')", - "UPDATE `{$prefix}store_product` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`slider_image` = replace(slider_image ,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}store_product_attr_value` SET `image` = replace(image ,'{$siteUrl}','{$url}')", - "UPDATE `{$prefix}store_seckill` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}store_combination` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}store_bargain` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}system_config` SET `value` = replace(value ,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}article_category` SET `image` = replace(`image` ,'{$siteUrl}','{$url}')", "UPDATE `{$prefix}article` SET `image_input` = replace(`image_input` ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}article_category` SET `image` = replace(`image` ,'{$siteUrl}','{$url}')", "UPDATE `{$prefix}article_content` SET `content` = replace(`content` ,'{$siteUrl}','{$url}')", - "UPDATE `{$prefix}store_category` SET `pic` = replace(`pic` ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}diy` SET `value` = replace(value ,'{$siteUrlJosn}','{$valueJosn}'),`default_value` = replace(default_value ,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}luck_lottery` SET `image` = replace(image ,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}luck_prize` SET `image` = replace(image ,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}store_bargain` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}store_category` SET `pic` = replace(`pic` ,'{$siteUrl}','{$url}'),`big_pic` = replace(`big_pic` ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}store_combination` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}store_integral` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}store_product` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`slider_image` = replace(slider_image ,'{$siteUrlJosn}','{$valueJosn}'),`recommend_image` = replace(recommend_image ,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}store_product_attr_result` SET `result` = replace(result ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}store_product_attr_value` SET `image` = replace(image ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}store_product_description` SET `description`= replace(description,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}store_seckill` SET `image` = replace(image ,'{$siteUrl}','{$url}'),`images` = replace(images,'{$siteUrlJosn}','{$valueJosn}')", + "UPDATE `{$prefix}system_attachment` SET `att_dir` = replace(att_dir ,'{$siteUrl}','{$url}'),`satt_dir` = replace(satt_dir ,'{$siteUrl}','{$url}')", + "UPDATE `{$prefix}system_config` SET `value` = replace(value ,'{$siteUrlJosn}','{$valueJosn}')", "UPDATE `{$prefix}system_group_data` SET `value` = replace(value ,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}diy` SET `value` = replace(value ,'{$siteUrlJosn}','{$valueJosn}')", - "UPDATE `{$prefix}store_product_description` SET `description`= replace(description,'{$siteUrl}','{$url}')" + "UPDATE `{$prefix}user` SET `avatar` = replace(avatar ,'{$siteUrlJosn}','{$valueJosn}')", ]; return Db::transaction(function () use ($sql) {