From 61c67d27172923a1f02c035eb4a28042f9fa029f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:12:10 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/api/controller/v1/TimerController.php | 4 +-
crmeb/app/api/route/v1.php | 2 +-
crmeb/app/listener/crontab/SystemCrontab.php | 46 ++++++-------------
.../system/timer/SystemTimerServices.php | 41 +++++++++++------
4 files changed, 44 insertions(+), 49 deletions(-)
diff --git a/crmeb/app/api/controller/v1/TimerController.php b/crmeb/app/api/controller/v1/TimerController.php
index 6a8872947..ce46896f2 100644
--- a/crmeb/app/api/controller/v1/TimerController.php
+++ b/crmeb/app/api/controller/v1/TimerController.php
@@ -20,9 +20,9 @@ class TimerController
* @email 442384644@qq.com
* @date 2023/02/17
*/
- public function timerRun()
+ public function crontabRun()
{
- app()->make(SystemTimerServices::class)->timerRun();
+ app()->make(SystemTimerServices::class)->crontabRun();
}
/**
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index 569fef1f8..17d120a8e 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -391,7 +391,7 @@ Route::group(function () {
/** 定时任务接口 */
//定时任务调用接口
- Route::get('timer/run', 'v1.TimerController/timerRun')->name('timerRun');
+ Route::get('crontab/run', 'v1.TimerController/crontabRun')->name('crontabRun');
//检测定时任务接口
Route::get('timer/check', 'v1.TimerController/timerCheck')->name('timerCheck');
//未支付自动取消订单
diff --git a/crmeb/app/listener/crontab/SystemCrontab.php b/crmeb/app/listener/crontab/SystemCrontab.php
index 335c5e0d1..e17a88a3c 100644
--- a/crmeb/app/listener/crontab/SystemCrontab.php
+++ b/crmeb/app/listener/crontab/SystemCrontab.php
@@ -23,9 +23,8 @@ class SystemCrontab implements ListenerInterface
public function handle($event): void
{
//自动写入文件方便检测是否启动定时任务命令
- $time = time();
- new Crontab('*/6 * * * * *', function () use ($time) {
- file_put_contents(root_path() . 'runtime/.timer', $time);
+ new Crontab('*/6 * * * * *', function () {
+ file_put_contents(root_path() . 'runtime/.timer', time());
});
/** @var SystemTimerServices $systemTimerServices */
@@ -38,9 +37,7 @@ class SystemCrontab implements ListenerInterface
if ($item['mark'] == 'order_cancel') {
new Crontab($timeStr, function () {
try {
- /** @var StoreOrderServices $orderServices */
- $orderServices = app()->make(StoreOrderServices::class);
- $orderServices->orderUnpaidCancel();
+ app()->make(StoreOrderServices::class)->orderUnpaidCancel();
$this->crontabLog(' 执行未支付自动取消订单');
} catch (\Throwable $e) {
Log::error('自动取消订单失败,失败原因:' . $e->getMessage());
@@ -51,9 +48,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'pink_expiration') {
new Crontab($timeStr, function () {
try {
- /** @var StorePinkServices $storePinkServices */
- $storePinkServices = app()->make(StorePinkServices::class);
- $storePinkServices->statusPink();
+ app()->make(StorePinkServices::class)->statusPink();
$this->crontabLog(' 执行拼团到期订单处理');
} catch (\Throwable $e) {
Log::error('拼团到期订单处理失败,失败原因:' . $e->getMessage());
@@ -64,9 +59,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'agent_unbind') {
new Crontab($timeStr, function () {
try {
- /** @var AgentManageServices $agentManage */
- $agentManage = app()->make(AgentManageServices::class);
- $agentManage->removeSpread();
+ app()->make(AgentManageServices::class)->removeSpread();
$this->crontabLog(' 执行自动解绑上级绑定');
} catch (\Throwable $e) {
Log::error('自动解除上级绑定失败,失败原因:' . $e->getMessage());
@@ -77,9 +70,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'live_product_status') {
new Crontab($timeStr, function () {
try {
- /** @var LiveGoodsServices $liveGoods */
- $liveGoods = app()->make(LiveGoodsServices::class);
- $liveGoods->syncGoodStatus();
+ app()->make(LiveGoodsServices::class)->syncGoodStatus();
$this->crontabLog(' 执行更新直播商品状态');
} catch (\Throwable $e) {
Log::error('更新直播商品状态失败,失败原因:' . $e->getMessage());
@@ -90,11 +81,8 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'live_room_status') {
new Crontab($timeStr, function () {
try {
- /** @var LiveRoomServices $liveRoom */
- $liveRoom = app()->make(LiveRoomServices::class);
- $liveRoom->syncRoomStatus();
+ app()->make(LiveRoomServices::class)->syncRoomStatus();
$this->crontabLog(' 执行更新直播间状态');
-
} catch (\Throwable $e) {
Log::error('更新直播间状态失败,失败原因:' . $e->getMessage());
}
@@ -104,9 +92,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'take_delivery') {
new Crontab($timeStr, function () {
try {
- /** @var StoreOrderTakeServices $services */
- $services = app()->make(StoreOrderTakeServices::class);
- $services->autoTakeOrder();
+ app()->make(StoreOrderTakeServices::class)->autoTakeOrder();
$this->crontabLog(' 执行自动收货');
} catch (\Throwable $e) {
Log::error('自动收货失败,失败原因:' . $e->getMessage());
@@ -117,9 +103,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'advance_off') {
new Crontab($timeStr, function () {
try {
- /** @var StoreProductServices $product */
- $product = app()->make(StoreProductServices::class);
- $product->downAdvance();
+ app()->make(StoreProductServices::class)->downAdvance();
$this->crontabLog(' 执行预售到期商品自动下架');
} catch (\Throwable $e) {
Log::error('预售到期商品自动下架失败,失败原因:' . $e->getMessage());
@@ -130,9 +114,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'product_replay') {
new Crontab($timeStr, function () {
try {
- /** @var StoreOrderServices $orderServices */
- $orderServices = app()->make(StoreOrderServices::class);
- $orderServices->autoComment();
+ app()->make(StoreOrderServices::class)->autoComment();
$this->crontabLog(' 执行自动好评');
} catch (\Throwable $e) {
Log::error('自动好评失败,失败原因:' . $e->getMessage());
@@ -143,9 +125,7 @@ class SystemCrontab implements ListenerInterface
elseif ($item['mark'] == 'clear_poster') {
new Crontab($timeStr, function () {
try {
- /** @var SystemAttachmentServices $attach */
- $attach = app()->make(SystemAttachmentServices::class);
- $attach->emptyYesterdayAttachment();
+ app()->make(SystemAttachmentServices::class)->emptyYesterdayAttachment();
$this->crontabLog(' 执行清除昨日海报');
} catch (\Throwable $e) {
Log::error('清除昨日海报失败,失败原因:' . $e->getMessage());
@@ -159,7 +139,8 @@ class SystemCrontab implements ListenerInterface
}
}
- /** 定时任务日志
+ /**
+ * 定时任务日志
* @param $msg
*/
public function crontabLog($msg)
@@ -170,6 +151,7 @@ class SystemCrontab implements ListenerInterface
Log::notice($date . $msg);
}
}
+
/**
* 0 1 2 3 4 5
* | | | | | |
diff --git a/crmeb/app/services/system/timer/SystemTimerServices.php b/crmeb/app/services/system/timer/SystemTimerServices.php
index 1dd322d13..e31943c1d 100644
--- a/crmeb/app/services/system/timer/SystemTimerServices.php
+++ b/crmeb/app/services/system/timer/SystemTimerServices.php
@@ -203,55 +203,68 @@ class SystemTimerServices extends BaseServices
* @email 442384644@qq.com
* @date 2023/02/17
*/
- public function timerRun()
+ public function crontabRun()
{
- $time = time();
- $date = date('Y-m-d H:i:s', time());
- $timer_log_open = config("log.timer_log", false);
- file_put_contents(root_path() . 'runtime/.timer', $time); //检测定时任务是否正常
+ file_put_contents(root_path() . 'runtime/.timer', time()); //检测定时任务是否正常
$list = $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray();
foreach ($list as $item) {
if ($item['next_execution_time'] < $time) {
if ($item['mark'] == 'order_cancel') {
//未支付自动取消订单
app()->make(StoreOrderServices::class)->orderUnpaidCancel();
- if($timer_log_open) Log::notice($date . ' 执行未支付自动取消订单');
+ $this->crontabLog(' 执行未支付自动取消订单');
} elseif ($item['mark'] == 'pink_expiration') {
//拼团到期订单处理
app()->make(StorePinkServices::class)->statusPink();
- if($timer_log_open) Log::notice($date . ' 执行拼团到期订单处理');
+ $this->crontabLog(' 执行拼团到期订单处理');
} elseif ($item['mark'] == 'agent_unbind') {
//自动解绑上级绑定
app()->make(AgentManageServices::class)->removeSpread();
- if($timer_log_open) Log::notice($date . ' 执行自动解绑上级绑定');
+ $this->crontabLog(' 执行自动解绑上级绑定');
} elseif ($item['mark'] == 'live_product_status') {
//更新直播商品状态
app()->make(LiveGoodsServices::class)->syncGoodStatus();
- if($timer_log_open) Log::notice($date . ' 执行更新直播商品状态');
+ $this->crontabLog(' 执行更新直播商品状态');
} elseif ($item['mark'] == 'live_room_status') {
//更新直播间状态
app()->make(LiveRoomServices::class)->syncRoomStatus();
- if($timer_log_open) Log::notice($date . ' 执行更新直播间状态');
+ $this->crontabLog(' 执行更新直播间状态');
} elseif ($item['mark'] == 'take_delivery') {
//自动收货
app()->make(StoreOrderTakeServices::class)->autoTakeOrder();
- if($timer_log_open) Log::notice($date . ' 执行自动收货');
+ $this->crontabLog(' 执行自动收货');
} elseif ($item['mark'] == 'advance_off') {
//查询预售到期商品自动下架
app()->make(StoreProductServices::class)->downAdvance();
- if($timer_log_open) Log::notice($date . ' 执行预售到期商品自动下架');
+ $this->crontabLog(' 执行预售到期商品自动下架');
} elseif ($item['mark'] == 'product_replay') {
//自动好评
app()->make(StoreOrderServices::class)->autoComment();
- if($timer_log_open) Log::notice($date . ' 执行自动好评');
+ $this->crontabLog(' 执行自动好评');
} elseif ($item['mark'] == 'clear_poster') {
//清除昨日海报
app()->make(SystemAttachmentServices::class)->emptyYesterdayAttachment();
- if($timer_log_open) Log::notice($date . ' 执行清除昨日海报');
+ $this->crontabLog(' 执行清除昨日海报');
}
//写入本次执行时间和下次执行时间
$this->dao->update(['mark' => $item['mark']], ['last_execution_time' => $time, 'next_execution_time' => $this->getTimerCycleTime($item)]);
}
}
}
+
+ /**
+ * 定时任务日志
+ * @param $msg
+ * @author 吴汐
+ * @email 442384644@qq.com
+ * @date 2023/02/21
+ */
+ public function crontabLog($msg)
+ {
+ $timer_log_open = config("log.timer_log", false);
+ if ($timer_log_open) {
+ $date = date('Y-m-d H:i:s', time());
+ Log::notice($date . $msg);
+ }
+ }
}
\ No newline at end of file
From dc00ec63f5da0f5e4f35322fea7b28cae7bfb376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:13:48 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E4=BD=A3=E9=87=91=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/user/UserBillServices.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php
index 0533da68e..b1c20d9f5 100644
--- a/crmeb/app/services/user/UserBillServices.php
+++ b/crmeb/app/services/user/UserBillServices.php
@@ -750,7 +750,7 @@ class UserBillServices extends BaseServices
$where_data = [];
$where_data['time'] = $where['time'];
if (isset($where['nickname']) && $where['nickname']) {
- $where_data[] = ['u.account|u.nickname|u.uid|u.phone', 'LIKE', "%$where[nickname]%"];
+ $where_data[] = ['u.nickname|u.uid', 'LIKE', "%$where[nickname]%"];
}
if (isset($where['price_max']) && isset($where['price_min'])) {
if ($where['price_max'] != '' && $where['price_min'] != '') {
From 767b3603242bc819176d5769e5e503cfa23d4067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:14:05 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E5=BE=AE=E4=BF=A1h5=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/pay/OrderPayServices.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php
index d3fe3456b..35e61906d 100644
--- a/crmeb/app/services/pay/OrderPayServices.php
+++ b/crmeb/app/services/pay/OrderPayServices.php
@@ -193,6 +193,11 @@ class OrderPayServices
if (request()->isWechat()) {
$jsConfig['pay_url'] = AllinPay::UNITODER_H5UNIONPAY;
}
+ break;
+ case PayServices::WEIXIN_PAY:
+ if (isset($jsConfig['mweb_url'])) {
+ $jsConfig['h5_url'] = $jsConfig['mweb_url'];
+ }
}
return ['jsConfig' => $jsConfig, 'order_id' => $order['order_id'], 'pay_key' => $payKey];
From bf78ff8acd64b636da99d6d73f2a590374bc5e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:14:14 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E4=BD=A3=E9=87=91=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/adminapi/controller/v1/export/ExportExcel.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/crmeb/app/adminapi/controller/v1/export/ExportExcel.php b/crmeb/app/adminapi/controller/v1/export/ExportExcel.php
index 8ad8c1c74..d034bcfbd 100644
--- a/crmeb/app/adminapi/controller/v1/export/ExportExcel.php
+++ b/crmeb/app/adminapi/controller/v1/export/ExportExcel.php
@@ -207,6 +207,7 @@ class ExportExcel extends AuthController
['price_max', ''],
['price_min', ''],
['excel', '1'],
+ ['time', ''],
]);
$data = $services->getCommissionList($where, false);
return app('json')->success($this->service->userCommission($data['list'] ?? []));
From ca02d7b69d22adcbce1581cc0105058cb193839f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:26:32 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{SystemTimer.php => SystemCrontab.php} | 6 ++---
crmeb/app/adminapi/route/system.php | 12 +++++-----
...erController.php => CrontabController.php} | 14 ++++++++----
crmeb/app/api/route/v1.php | 22 +++++++++----------
.../dao/system/crontab/SystemCrontabDao.php | 18 +++++++++++++++
crmeb/app/dao/system/timer/SystemTimerDao.php | 18 ---------------
crmeb/app/listener/crontab/SystemCrontab.php | 8 +++----
.../SystemCrontab.php} | 4 ++--
.../SystemCrontabServices.php} | 8 +++----
9 files changed, 58 insertions(+), 52 deletions(-)
rename crmeb/app/adminapi/controller/v1/system/{SystemTimer.php => SystemCrontab.php} (91%)
rename crmeb/app/api/controller/v1/{TimerController.php => CrontabController.php} (92%)
create mode 100644 crmeb/app/dao/system/crontab/SystemCrontabDao.php
delete mode 100644 crmeb/app/dao/system/timer/SystemTimerDao.php
rename crmeb/app/model/system/{timer/SystemTimer.php => crontab/SystemCrontab.php} (78%)
rename crmeb/app/services/system/{timer/SystemTimerServices.php => crontab/SystemCrontabServices.php} (98%)
diff --git a/crmeb/app/adminapi/controller/v1/system/SystemTimer.php b/crmeb/app/adminapi/controller/v1/system/SystemCrontab.php
similarity index 91%
rename from crmeb/app/adminapi/controller/v1/system/SystemTimer.php
rename to crmeb/app/adminapi/controller/v1/system/SystemCrontab.php
index 199ea4856..b4d4f2a52 100644
--- a/crmeb/app/adminapi/controller/v1/system/SystemTimer.php
+++ b/crmeb/app/adminapi/controller/v1/system/SystemCrontab.php
@@ -3,12 +3,12 @@
namespace app\adminapi\controller\v1\system;
use app\adminapi\controller\AuthController;
-use app\services\system\timer\SystemTimerServices;
+use app\services\system\crontab\SystemCrontabServices;
use think\facade\App;
-class SystemTimer extends AuthController
+class SystemCrontab extends AuthController
{
- public function __construct(App $app, SystemTimerServices $services)
+ public function __construct(App $app, SystemCrontabServices $services)
{
parent::__construct($app);
$this->services = $services;
diff --git a/crmeb/app/adminapi/route/system.php b/crmeb/app/adminapi/route/system.php
index d793397a1..91912430a 100644
--- a/crmeb/app/adminapi/route/system.php
+++ b/crmeb/app/adminapi/route/system.php
@@ -99,17 +99,17 @@ Route::group('system', function () {
/** 定时任务 */
//定时任务列表
- Route::get('timer/list', 'v1.system.SystemTimer/getTimerList')->option(['real_name' => '定时任务列表']);
+ Route::get('timer/list', 'v1.system.SystemCrontab/getTimerList')->option(['real_name' => '定时任务列表']);
//定时任务类型
- Route::get('timer/mark', 'v1.system.SystemTimer/getMarkList')->option(['real_name' => '定时任务类型']);
+ Route::get('timer/mark', 'v1.system.SystemCrontab/getMarkList')->option(['real_name' => '定时任务类型']);
//定时任务详情
- Route::get('timer/info/:id', 'v1.system.SystemTimer/getTimerInfo')->option(['real_name' => '定时任务详情']);
+ Route::get('timer/info/:id', 'v1.system.SystemCrontab/getTimerInfo')->option(['real_name' => '定时任务详情']);
//定时任务添加编辑
- Route::post('timer/save', 'v1.system.SystemTimer/saveTimer')->option(['real_name' => '定时任务添加编辑']);
+ Route::post('timer/save', 'v1.system.SystemCrontab/saveTimer')->option(['real_name' => '定时任务添加编辑']);
//删除定时任务
- Route::delete('timer/del/:id', 'v1.system.SystemTimer/delTimer')->option(['real_name' => '删除定时任务']);
+ Route::delete('timer/del/:id', 'v1.system.SystemCrontab/delTimer')->option(['real_name' => '删除定时任务']);
//定时任务是否开启开关
- Route::get('timer/set_open/:id/:is_open', 'v1.system.SystemTimer/setTimerStatus')->option(['real_name' => '定时任务是否开启开关']);
+ Route::get('timer/set_open/:id/:is_open', 'v1.system.SystemCrontab/setTimerStatus')->option(['real_name' => '定时任务是否开启开关']);
})->middleware([
\app\http\middleware\AllowOriginMiddleware::class,
diff --git a/crmeb/app/api/controller/v1/TimerController.php b/crmeb/app/api/controller/v1/CrontabController.php
similarity index 92%
rename from crmeb/app/api/controller/v1/TimerController.php
rename to crmeb/app/api/controller/v1/CrontabController.php
index ce46896f2..a6ae59112 100644
--- a/crmeb/app/api/controller/v1/TimerController.php
+++ b/crmeb/app/api/controller/v1/CrontabController.php
@@ -10,9 +10,15 @@ use app\services\order\StoreOrderServices;
use app\services\order\StoreOrderTakeServices;
use app\services\product\product\StoreProductServices;
use app\services\system\attachment\SystemAttachmentServices;
-use app\services\system\timer\SystemTimerServices;
+use app\services\system\crontab\SystemCrontabServices;
-class TimerController
+/**
+ * 定时任务控制器
+ * @author 吴汐
+ * @email 442384644@qq.com
+ * @date 2023/02/21
+ */
+class CrontabController
{
/**
* 定时任务调用接口
@@ -22,13 +28,13 @@ class TimerController
*/
public function crontabRun()
{
- app()->make(SystemTimerServices::class)->crontabRun();
+ app()->make(SystemCrontabServices::class)->crontabRun();
}
/**
* 检测定时任务是否正常，必须6秒执行一次
*/
- public function timerCheck()
+ public function crontabCheck()
{
file_put_contents(root_path() . 'runtime/.timer', time());
}
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index 17d120a8e..01f9fc22c 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -391,27 +391,27 @@ Route::group(function () {
/** 定时任务接口 */
//定时任务调用接口
- Route::get('crontab/run', 'v1.TimerController/crontabRun')->name('crontabRun');
+ Route::get('crontab/run', 'v1.CrontabController/crontabRun')->name('crontabRun');
//检测定时任务接口
- Route::get('timer/check', 'v1.TimerController/timerCheck')->name('timerCheck');
+ Route::get('crontab/check', 'v1.CrontabController/crontabCheck')->name('crontabCheck');
//未支付自动取消订单
- Route::get('timer/order_cancel', 'v1.TimerController/orderUnpaidCancel')->name('orderUnpaidCancel');
+ Route::get('crontab/order_cancel', 'v1.CrontabController/orderUnpaidCancel')->name('orderUnpaidCancel');
//拼团到期订单处理
- Route::get('timer/pink_expiration', 'v1.TimerController/pinkExpiration')->name('pinkExpiration');
+ Route::get('crontab/pink_expiration', 'v1.CrontabController/pinkExpiration')->name('pinkExpiration');
//自动解绑上级绑定
- Route::get('timer/agent_unbind', 'v1.TimerController/agentUnbind')->name('agentUnbind');
+ Route::get('crontab/agent_unbind', 'v1.CrontabController/agentUnbind')->name('agentUnbind');
//更新直播商品状态
- Route::get('timer/live_product_status', 'v1.TimerController/syncGoodStatus')->name('syncGoodStatus');
+ Route::get('crontab/live_product_status', 'v1.CrontabController/syncGoodStatus')->name('syncGoodStatus');
//更新直播间状态
- Route::get('timer/live_room_status', 'v1.TimerController/syncRoomStatus')->name('syncRoomStatus');
+ Route::get('crontab/live_room_status', 'v1.CrontabController/syncRoomStatus')->name('syncRoomStatus');
//自动收货
- Route::get('timer/take_delivery', 'v1.TimerController/autoTakeOrder')->name('autoTakeOrder');
+ Route::get('crontab/take_delivery', 'v1.CrontabController/autoTakeOrder')->name('autoTakeOrder');
//查询预售到期商品自动下架
- Route::get('timer/advance_off', 'v1.TimerController/downAdvance')->name('downAdvance');
+ Route::get('crontab/advance_off', 'v1.CrontabController/downAdvance')->name('downAdvance');
//自动好评
- Route::get('timer/product_replay', 'v1.TimerController/autoComment')->name('autoComment');
+ Route::get('crontab/product_replay', 'v1.CrontabController/autoComment')->name('autoComment');
//清除昨日海报
- Route::get('timer/clear_poster', 'v1.TimerController/emptyYesterdayAttachment')->name('emptyYesterdayAttachment');
+ Route::get('crontab/clear_poster', 'v1.CrontabController/emptyYesterdayAttachment')->name('emptyYesterdayAttachment');
})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class)->middleware(\app\api\middleware\AuthTokenMiddleware::class, false);
diff --git a/crmeb/app/dao/system/crontab/SystemCrontabDao.php b/crmeb/app/dao/system/crontab/SystemCrontabDao.php
new file mode 100644
index 000000000..0703566d2
--- /dev/null
+++ b/crmeb/app/dao/system/crontab/SystemCrontabDao.php
@@ -0,0 +1,18 @@
+make(SystemTimerServices::class);
- $list = $systemTimerServices->selectList(['is_del' => 0, 'is_open' => 1])->toArray();
+ /** @var SystemCrontabServices $systemTimerServices */
+ $systemCrontabServices = app()->make(SystemCrontabServices::class);
+ $list = $systemCrontabServices->selectList(['is_del' => 0, 'is_open' => 1])->toArray();
foreach ($list as &$item) {
//获取定时任务时间字符串
$timeStr = $this->getTimerStr($item);
diff --git a/crmeb/app/model/system/timer/SystemTimer.php b/crmeb/app/model/system/crontab/SystemCrontab.php
similarity index 78%
rename from crmeb/app/model/system/timer/SystemTimer.php
rename to crmeb/app/model/system/crontab/SystemCrontab.php
index bf54660a6..73deb03df 100644
--- a/crmeb/app/model/system/timer/SystemTimer.php
+++ b/crmeb/app/model/system/crontab/SystemCrontab.php
@@ -1,11 +1,11 @@
'清除昨日海报',
];
- public function __construct(SystemTimerDao $dao)
+ public function __construct(SystemCrontabDao $dao)
{
$this->dao = $dao;
}
From 5dd14525b3b8f9551587160510566a6685874444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 16:29:25 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=B7=AF=E7=94=B1?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/adminapi/route/system.php | 12 ++++++------
template/admin/src/api/system.js | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/crmeb/app/adminapi/route/system.php b/crmeb/app/adminapi/route/system.php
index 91912430a..2d0160d2a 100644
--- a/crmeb/app/adminapi/route/system.php
+++ b/crmeb/app/adminapi/route/system.php
@@ -99,17 +99,17 @@ Route::group('system', function () {
/** 定时任务 */
//定时任务列表
- Route::get('timer/list', 'v1.system.SystemCrontab/getTimerList')->option(['real_name' => '定时任务列表']);
+ Route::get('crontab/list', 'v1.system.SystemCrontab/getTimerList')->option(['real_name' => '定时任务列表']);
//定时任务类型
- Route::get('timer/mark', 'v1.system.SystemCrontab/getMarkList')->option(['real_name' => '定时任务类型']);
+ Route::get('crontab/mark', 'v1.system.SystemCrontab/getMarkList')->option(['real_name' => '定时任务类型']);
//定时任务详情
- Route::get('timer/info/:id', 'v1.system.SystemCrontab/getTimerInfo')->option(['real_name' => '定时任务详情']);
+ Route::get('crontab/info/:id', 'v1.system.SystemCrontab/getTimerInfo')->option(['real_name' => '定时任务详情']);
//定时任务添加编辑
- Route::post('timer/save', 'v1.system.SystemCrontab/saveTimer')->option(['real_name' => '定时任务添加编辑']);
+ Route::post('crontab/save', 'v1.system.SystemCrontab/saveTimer')->option(['real_name' => '定时任务添加编辑']);
//删除定时任务
- Route::delete('timer/del/:id', 'v1.system.SystemCrontab/delTimer')->option(['real_name' => '删除定时任务']);
+ Route::delete('crontab/del/:id', 'v1.system.SystemCrontab/delTimer')->option(['real_name' => '删除定时任务']);
//定时任务是否开启开关
- Route::get('timer/set_open/:id/:is_open', 'v1.system.SystemCrontab/setTimerStatus')->option(['real_name' => '定时任务是否开启开关']);
+ Route::get('crontab/set_open/:id/:is_open', 'v1.system.SystemCrontab/setTimerStatus')->option(['real_name' => '定时任务是否开启开关']);
})->middleware([
\app\http\middleware\AllowOriginMiddleware::class,
diff --git a/template/admin/src/api/system.js b/template/admin/src/api/system.js
index 9b1d5fb8b..71e195d72 100644
--- a/template/admin/src/api/system.js
+++ b/template/admin/src/api/system.js
@@ -723,7 +723,7 @@ export function upgradeableListApi(params) {
*/
export function timerIndex(params) {
return request({
- url: `system/timer/list`,
+ url: `system/crontab/list`,
params,
});
}
@@ -735,7 +735,7 @@ export function timerIndex(params) {
*/
export function showTimer(id, is_open) {
return request({
- url: `system/timer/set_open/${id}/${is_open}`,
+ url: `system/crontab/set_open/${id}/${is_open}`,
});
}
@@ -746,7 +746,7 @@ export function showTimer(id, is_open) {
*/
export function timerInfo(id) {
return request({
- url: `system/timer/info/${id}`,
+ url: `system/crontab/info/${id}`,
});
}
@@ -757,7 +757,7 @@ export function timerInfo(id) {
*/
export function saveTimer(data) {
return request({
- url: `system/timer/save`,
+ url: `system/crontab/save`,
method: 'post',
data,
});
@@ -771,7 +771,7 @@ export function saveTimer(data) {
*/
export function updateTimer(id, data) {
return request({
- url: `system/timer/update/${id}`,
+ url: `system/crontab/update/${id}`,
method: 'post',
data,
});
@@ -783,6 +783,6 @@ export function updateTimer(id, data) {
*/
export function timerTask() {
return request({
- url: `/system/timer/mark`,
+ url: `system/crontab/mark`,
});
}
From c6d17a15302b24139ca559fb15a8b5e8fedc8775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 17:14:53 +0800
Subject: [PATCH 07/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/event.php | 36 +++++++++----------
...{AdminLogin.php => AdminLoginListener.php} | 2 +-
...mCrontab.php => SystemCrontabListener.php} | 2 +-
.../http/{HttpEnd.php => HttpEndListener.php} | 2 +-
.../notice/{Notice.php => NoticeListener.php} | 2 +-
...After.php => OrderCreateAfterListener.php} | 4 +--
...Delivery.php => OrderDeliveryListener.php} | 4 +--
...uccess.php => OrderPaySuccessListener.php} | 4 +--
...php => OrderRefundCancelAfterListener.php} | 4 +--
...php => OrderRefundCreateAfterListener.php} | 2 +-
.../{OrderTake.php => OrderTakeListener.php} | 4 +--
.../out/{OutPush.php => OutPushListener.php} | 2 +-
.../pay/{Notify.php => NotifyListener.php} | 4 +--
...{QueueStart.php => QueueStartListener.php} | 2 +-
.../user/{Login.php => LoginListener.php} | 4 +--
.../{Register.php => RegisterListener.php} | 4 +--
.../{UserLevel.php => UserLevelListener.php} | 4 +--
.../{UserVisit.php => UserVisitListener.php} | 4 +--
.../wechat/{Auth.php => AuthListener.php} | 4 +--
.../order/StoreOrderDeliveryServices.php | 10 ++++--
20 files changed, 54 insertions(+), 50 deletions(-)
rename crmeb/app/listener/admin/{AdminLogin.php => AdminLoginListener.php} (98%)
rename crmeb/app/listener/crontab/{SystemCrontab.php => SystemCrontabListener.php} (99%)
rename crmeb/app/listener/http/{HttpEnd.php => HttpEndListener.php} (99%)
rename crmeb/app/listener/notice/{Notice.php => NoticeListener.php} (99%)
rename crmeb/app/listener/order/{OrderCreateAfter.php => OrderCreateAfterListener.php} (97%)
rename crmeb/app/listener/order/{OrderDelivery.php => OrderDeliveryListener.php} (85%)
rename crmeb/app/listener/order/{OrderPaySuccess.php => OrderPaySuccessListener.php} (97%)
rename crmeb/app/listener/order/{OrderRefundCancelAfter.php => OrderRefundCancelAfterListener.php} (71%)
rename crmeb/app/listener/order/{OrderRefundCreateAfter.php => OrderRefundCreateAfterListener.php} (83%)
rename crmeb/app/listener/order/{OrderTake.php => OrderTakeListener.php} (94%)
rename crmeb/app/listener/out/{OutPush.php => OutPushListener.php} (98%)
rename crmeb/app/listener/pay/{Notify.php => NotifyListener.php} (97%)
rename crmeb/app/listener/queue/{QueueStart.php => QueueStartListener.php} (97%)
rename crmeb/app/listener/user/{Login.php => LoginListener.php} (73%)
rename crmeb/app/listener/user/{Register.php => RegisterListener.php} (96%)
rename crmeb/app/listener/user/{UserLevel.php => UserLevelListener.php} (84%)
rename crmeb/app/listener/user/{UserVisit.php => UserVisitListener.php} (87%)
rename crmeb/app/listener/wechat/{Auth.php => AuthListener.php} (78%)
diff --git a/crmeb/app/event.php b/crmeb/app/event.php
index 2f5f4792e..39a74ce56 100644
--- a/crmeb/app/event.php
+++ b/crmeb/app/event.php
@@ -19,26 +19,26 @@ return [
'listen' => [
'AppInit' => [],
'HttpRun' => [],
- 'HttpEnd' => [\app\listener\http\HttpEnd::class], //HTTP请求结束回调事件
+ 'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件
'LogLevel' => [],
'LogWrite' => [],
- 'queue.start' => [\app\listener\queue\QueueStart::class],
- 'user.login' => [\app\listener\user\Login::class],
- 'admin.login' => [\app\listener\admin\AdminLogin::class],//管理员登录
- 'user.register' => [\app\listener\user\Register::class], //用户注册后置事件
- 'wechat.auth' => [\app\listener\wechat\Auth::class], //用户授权后置事件
- 'order.orderCreateAfter' => [\app\listener\order\OrderCreateAfter::class], //订单创建后置事件
- 'order.orderPaySuccess' => [\app\listener\order\OrderPaySuccess::class], //订单支付成功后置事件
- 'order.orderDelivery' => [\app\listener\order\OrderDelivery::class], //订单发货后置事件
- 'order.orderTake' => [\app\listener\order\OrderTake::class], //订单收货后置事件
- 'order.orderRefundCreateAfter' => [\app\listener\order\OrderRefundCreateAfter::class], //售后单生成后置事件
- 'order.orderRefundCancelAfter' => [\app\listener\order\OrderRefundCancelAfter::class], //售后单取消后置事件
- 'out.outPush' => [\app\listener\out\OutPush::class], //对外推送事件
- 'user.userLevel' => [\app\listener\user\UserLevel::class], //用户升级事件
- 'user.userVisit' => [\app\listener\user\UserVisit::class], //用户访问事件
- 'notice.notice' => [\app\listener\notice\Notice::class], //通知->消息事件
- 'pay.notify' => [\app\listener\pay\Notify::class],//支付异步回调
- 'Crontab' => [\app\listener\crontab\SystemCrontab::class],//定时任务事件
+ 'queue.start' => [\app\listener\queue\QueueStartListener::class],
+ 'user.login' => [\app\listener\user\LoginListener::class],
+ 'admin.login' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
+ 'user.register' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
+ 'wechat.auth' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
+ 'order.orderCreateAfter' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
+ 'order.orderPaySuccess' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
+ 'order.orderDelivery' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
+ 'order.orderTake' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
+ 'order.orderRefundCreateAfter' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
+ 'order.orderRefundCancelAfter' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
+ 'out.outPush' => [\app\listener\out\OutPushListener::class], //对外推送事件
+ 'user.userLevel' => [\app\listener\user\UserLevelListener::class], //用户升级事件
+ 'user.userVisit' => [\app\listener\user\UserVisitListener::class], //用户访问事件
+ 'notice.notice' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
+ 'pay.notify' => [\app\listener\pay\NotifyListener::class],//支付异步回调
+ 'Crontab' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件
],
];
diff --git a/crmeb/app/listener/admin/AdminLogin.php b/crmeb/app/listener/admin/AdminLoginListener.php
similarity index 98%
rename from crmeb/app/listener/admin/AdminLogin.php
rename to crmeb/app/listener/admin/AdminLoginListener.php
index 9db525028..049fa17c7 100644
--- a/crmeb/app/listener/admin/AdminLogin.php
+++ b/crmeb/app/listener/admin/AdminLoginListener.php
@@ -17,7 +17,7 @@ namespace app\listener\admin;
* Class AdminLogin
* @package app\listener\admin
*/
-class AdminLogin
+class AdminLoginListener
{
public function handle($event)
diff --git a/crmeb/app/listener/crontab/SystemCrontab.php b/crmeb/app/listener/crontab/SystemCrontabListener.php
similarity index 99%
rename from crmeb/app/listener/crontab/SystemCrontab.php
rename to crmeb/app/listener/crontab/SystemCrontabListener.php
index 1a067e9c8..ba3c33adf 100644
--- a/crmeb/app/listener/crontab/SystemCrontab.php
+++ b/crmeb/app/listener/crontab/SystemCrontabListener.php
@@ -18,7 +18,7 @@ use Workerman\Crontab\Crontab;
/**
* 系统定时任务
*/
-class SystemCrontab implements ListenerInterface
+class SystemCrontabListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/http/HttpEnd.php b/crmeb/app/listener/http/HttpEndListener.php
similarity index 99%
rename from crmeb/app/listener/http/HttpEnd.php
rename to crmeb/app/listener/http/HttpEndListener.php
index 468e0b88e..120e5c3e5 100644
--- a/crmeb/app/listener/http/HttpEnd.php
+++ b/crmeb/app/listener/http/HttpEndListener.php
@@ -19,7 +19,7 @@ use think\Response;
* Class Create
* @package app\listener\http
*/
-class HttpEnd
+class HttpEndListener
{
public function handle(Response $response):void
{
diff --git a/crmeb/app/listener/notice/Notice.php b/crmeb/app/listener/notice/NoticeListener.php
similarity index 99%
rename from crmeb/app/listener/notice/Notice.php
rename to crmeb/app/listener/notice/NoticeListener.php
index d907bdad1..f5c59f516 100644
--- a/crmeb/app/listener/notice/Notice.php
+++ b/crmeb/app/listener/notice/NoticeListener.php
@@ -31,7 +31,7 @@ use crmeb\utils\Str;
* Class Create
* @package app\listener\order
*/
-class Notice implements ListenerInterface
+class NoticeListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderCreateAfter.php b/crmeb/app/listener/order/OrderCreateAfterListener.php
similarity index 97%
rename from crmeb/app/listener/order/OrderCreateAfter.php
rename to crmeb/app/listener/order/OrderCreateAfterListener.php
index f47b133fa..0a5eba0d9 100644
--- a/crmeb/app/listener/order/OrderCreateAfter.php
+++ b/crmeb/app/listener/order/OrderCreateAfterListener.php
@@ -18,10 +18,10 @@ use crmeb\utils\Arr;
/**
* 订单创建后置事件
- * Class OrderCreateAfter
+ * Class OrderCreateAfterListener
* @package app\listener\order
*/
-class OrderCreateAfter implements ListenerInterface
+class OrderCreateAfterListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderDelivery.php b/crmeb/app/listener/order/OrderDeliveryListener.php
similarity index 85%
rename from crmeb/app/listener/order/OrderDelivery.php
rename to crmeb/app/listener/order/OrderDeliveryListener.php
index bb691307d..64d27025f 100644
--- a/crmeb/app/listener/order/OrderDelivery.php
+++ b/crmeb/app/listener/order/OrderDeliveryListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 订单到期自动收货
- * Class OrderDelivery
+ * Class OrderDeliveryListener
* @package app\listener\order
*/
-class OrderDelivery implements ListenerInterface
+class OrderDeliveryListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderPaySuccess.php b/crmeb/app/listener/order/OrderPaySuccessListener.php
similarity index 97%
rename from crmeb/app/listener/order/OrderPaySuccess.php
rename to crmeb/app/listener/order/OrderPaySuccessListener.php
index 3824ebf0a..2a02181cd 100644
--- a/crmeb/app/listener/order/OrderPaySuccess.php
+++ b/crmeb/app/listener/order/OrderPaySuccessListener.php
@@ -27,10 +27,10 @@ use think\facade\Log;
/**
* 订单支付成功后
- * Class OrderPaySuccess
+ * Class OrderPaySuccessListener
* @package app\listener\order
*/
-class OrderPaySuccess implements ListenerInterface
+class OrderPaySuccessListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderRefundCancelAfter.php b/crmeb/app/listener/order/OrderRefundCancelAfterListener.php
similarity index 71%
rename from crmeb/app/listener/order/OrderRefundCancelAfter.php
rename to crmeb/app/listener/order/OrderRefundCancelAfterListener.php
index a63bb006a..03f091d4b 100644
--- a/crmeb/app/listener/order/OrderRefundCancelAfter.php
+++ b/crmeb/app/listener/order/OrderRefundCancelAfterListener.php
@@ -7,10 +7,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 售后单取消
- * Class OrderRefundCancelAfter
+ * Class OrderRefundCancelAfterListener
* @package app\listener\order
*/
-class OrderRefundCancelAfter implements ListenerInterface
+class OrderRefundCancelAfterListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderRefundCreateAfter.php b/crmeb/app/listener/order/OrderRefundCreateAfterListener.php
similarity index 83%
rename from crmeb/app/listener/order/OrderRefundCreateAfter.php
rename to crmeb/app/listener/order/OrderRefundCreateAfterListener.php
index 96064a104..75644fe2e 100644
--- a/crmeb/app/listener/order/OrderRefundCreateAfter.php
+++ b/crmeb/app/listener/order/OrderRefundCreateAfterListener.php
@@ -11,7 +11,7 @@ use crmeb\interfaces\ListenerInterface;
* Class orderRefundCreateAfter
* @package app\listener\order
*/
-class OrderRefundCreateAfter implements ListenerInterface
+class OrderRefundCreateAfterListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/order/OrderTake.php b/crmeb/app/listener/order/OrderTakeListener.php
similarity index 94%
rename from crmeb/app/listener/order/OrderTake.php
rename to crmeb/app/listener/order/OrderTakeListener.php
index 6d31fc3c6..41fc606b4 100644
--- a/crmeb/app/listener/order/OrderTake.php
+++ b/crmeb/app/listener/order/OrderTakeListener.php
@@ -11,10 +11,10 @@ use think\facade\Log;
/**
* 订单确认收货
- * Class OrderTake
+ * Class OrderTakeListener
* @package app\listener\order
*/
-class OrderTake implements ListenerInterface
+class OrderTakeListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/out/OutPush.php b/crmeb/app/listener/out/OutPushListener.php
similarity index 98%
rename from crmeb/app/listener/out/OutPush.php
rename to crmeb/app/listener/out/OutPushListener.php
index b679f58a9..1b7c63ba3 100644
--- a/crmeb/app/listener/out/OutPush.php
+++ b/crmeb/app/listener/out/OutPushListener.php
@@ -9,7 +9,7 @@ use crmeb\services\CacheService;
use crmeb\services\HttpService;
use think\facade\Log;
-class OutPush implements ListenerInterface
+class OutPushListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/pay/Notify.php b/crmeb/app/listener/pay/NotifyListener.php
similarity index 97%
rename from crmeb/app/listener/pay/Notify.php
rename to crmeb/app/listener/pay/NotifyListener.php
index 8b2ddb253..5c9677ecf 100644
--- a/crmeb/app/listener/pay/Notify.php
+++ b/crmeb/app/listener/pay/NotifyListener.php
@@ -18,10 +18,10 @@ use crmeb\utils\Hook;
/**
* 支付异步回调
- * Class Notify
+ * Class NotifyListener
* @package app\listener\pay
*/
-class Notify
+class NotifyListener
{
/**
* @param $event
diff --git a/crmeb/app/listener/queue/QueueStart.php b/crmeb/app/listener/queue/QueueStartListener.php
similarity index 97%
rename from crmeb/app/listener/queue/QueueStart.php
rename to crmeb/app/listener/queue/QueueStartListener.php
index cd6606f7a..8a315fa0b 100644
--- a/crmeb/app/listener/queue/QueueStart.php
+++ b/crmeb/app/listener/queue/QueueStartListener.php
@@ -16,7 +16,7 @@ namespace app\listener\queue;
use think\console\Output;
-class QueueStart
+class QueueStartListener
{
public function handle(Output $output)
diff --git a/crmeb/app/listener/user/Login.php b/crmeb/app/listener/user/LoginListener.php
similarity index 73%
rename from crmeb/app/listener/user/Login.php
rename to crmeb/app/listener/user/LoginListener.php
index edc855fef..68eca519e 100644
--- a/crmeb/app/listener/user/Login.php
+++ b/crmeb/app/listener/user/LoginListener.php
@@ -8,10 +8,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 用户登录后置事件
- * Class Login
+ * Class LoginListener
* @package app\listener\user
*/
-class Login implements ListenerInterface
+class LoginListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/user/Register.php b/crmeb/app/listener/user/RegisterListener.php
similarity index 96%
rename from crmeb/app/listener/user/Register.php
rename to crmeb/app/listener/user/RegisterListener.php
index 27e4a2769..04b1f0ae1 100644
--- a/crmeb/app/listener/user/Register.php
+++ b/crmeb/app/listener/user/RegisterListener.php
@@ -13,10 +13,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 注册完成后置事件
- * Class Register
+ * Class RegisterListener
* @package app\listener\user
*/
-class Register implements ListenerInterface
+class RegisterListener implements ListenerInterface
{
/**
* 注册完成后置事件
diff --git a/crmeb/app/listener/user/UserLevel.php b/crmeb/app/listener/user/UserLevelListener.php
similarity index 84%
rename from crmeb/app/listener/user/UserLevel.php
rename to crmeb/app/listener/user/UserLevelListener.php
index 2ff62a122..2755b490d 100644
--- a/crmeb/app/listener/user/UserLevel.php
+++ b/crmeb/app/listener/user/UserLevelListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 用户升级事件
- * Class UserLevel
+ * Class UserLevelListener
* @package app\listener\user
*/
-class UserLevel implements ListenerInterface
+class UserLevelListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/user/UserVisit.php b/crmeb/app/listener/user/UserVisitListener.php
similarity index 87%
rename from crmeb/app/listener/user/UserVisit.php
rename to crmeb/app/listener/user/UserVisitListener.php
index 9645e8b1f..821bcf886 100644
--- a/crmeb/app/listener/user/UserVisit.php
+++ b/crmeb/app/listener/user/UserVisitListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 写入用户访问
- * Class UserVisit
+ * Class UserVisitListener
* @package app\listener\user
*/
-class UserVisit implements ListenerInterface
+class UserVisitListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/listener/wechat/Auth.php b/crmeb/app/listener/wechat/AuthListener.php
similarity index 78%
rename from crmeb/app/listener/wechat/Auth.php
rename to crmeb/app/listener/wechat/AuthListener.php
index da6eb5c19..85fdaace9 100644
--- a/crmeb/app/listener/wechat/Auth.php
+++ b/crmeb/app/listener/wechat/AuthListener.php
@@ -8,10 +8,10 @@ use crmeb\interfaces\ListenerInterface;
/**
* 用户授权后置事件
- * Class Auth
+ * Class AuthListener
* @package app\listener\wechat
*/
-class Auth implements ListenerInterface
+class AuthListener implements ListenerInterface
{
public function handle($event): void
{
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 6716aa5c1..7388aeb1a 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -364,6 +364,12 @@ class StoreOrderDeliveryServices extends BaseServices
* @param int $id
* @param array $data
* @return bool
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @author 吴汐
+ * @email 442384644@qq.com
+ * @date 2023/02/21
*/
public function splitDelivery(int $id, array $data)
{
@@ -396,10 +402,8 @@ class StoreOrderDeliveryServices extends BaseServices
}
$cart_ids = $data['cart_ids'];
- /** @var StoreOrderCartInfoServices $storeOrderCartInfoServices */
- $storeOrderCartInfoServices = app()->make(StoreOrderCartInfoServices::class);
unset($data['cart_ids']);
- $this->transaction(function () use ($id, $cart_ids, $orderInfo, $data, $storeOrderCartInfoServices) {
+ $this->transaction(function () use ($id, $cart_ids, $orderInfo, $data) {
/** @var StoreOrderSplitServices $storeOrderSplitServices */
$storeOrderSplitServices = app()->make(StoreOrderSplitServices::class);
//订单拆单
From 5c0c7cd1afbb142d90edc2b80e3889e85e7ece25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 17:39:45 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/v1/order/StoreOrder.php | 2 +-
crmeb/app/event.php | 34 +++++++++----------
crmeb/app/jobs/UnpaidOrderSend.php | 2 +-
.../activity/advance/StoreAdvanceServices.php | 2 +-
.../activity/bargain/StoreBargainServices.php | 4 +--
.../combination/StoreCombinationServices.php | 2 +-
.../combination/StorePinkServices.php | 10 +++---
.../activity/seckill/StoreSeckillServices.php | 2 +-
.../order/StoreOrderCreateServices.php | 4 +--
.../order/StoreOrderDeliveryServices.php | 6 ++--
.../order/StoreOrderRefundServices.php | 18 +++++-----
.../app/services/order/StoreOrderServices.php | 2 +-
.../order/StoreOrderSuccessServices.php | 8 ++---
.../services/order/StoreOrderTakeServices.php | 12 +++----
.../product/product/StoreProductServices.php | 2 +-
.../system/admin/SystemAdminServices.php | 2 +-
crmeb/app/services/user/LoginServices.php | 12 +++----
crmeb/app/services/user/UserBillServices.php | 2 +-
.../app/services/user/UserExtractServices.php | 6 ++--
.../services/user/UserRechargeServices.php | 4 +--
crmeb/app/services/user/UserServices.php | 8 ++---
crmeb/app/services/user/UserSignServices.php | 2 +-
crmeb/crmeb/command/Timer.php | 2 +-
crmeb/crmeb/services/AliPayService.php | 2 +-
crmeb/crmeb/services/app/WechatService.php | 4 +--
crmeb/crmeb/services/pay/storage/AllinPay.php | 2 +-
.../services/pay/storage/V3WechatPay.php | 2 +-
.../think-queue/src/queue/command/Listen.php | 2 +-
28 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
index afc61f48e..97a7740fe 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
@@ -591,7 +591,7 @@ class StoreOrder extends AuthController
}
$services->storeProductOrderRefundNo((int)$id, $refund_reason);
//提醒推送
- event('notice.notice', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
+ event('noticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
return app('json')->success(100010);
}
diff --git a/crmeb/app/event.php b/crmeb/app/event.php
index 39a74ce56..044fd7c4d 100644
--- a/crmeb/app/event.php
+++ b/crmeb/app/event.php
@@ -22,23 +22,23 @@ return [
'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件
'LogLevel' => [],
'LogWrite' => [],
- 'queue.start' => [\app\listener\queue\QueueStartListener::class],
- 'user.login' => [\app\listener\user\LoginListener::class],
- 'admin.login' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
- 'user.register' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
- 'wechat.auth' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
- 'order.orderCreateAfter' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
- 'order.orderPaySuccess' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
- 'order.orderDelivery' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
- 'order.orderTake' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
- 'order.orderRefundCreateAfter' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
- 'order.orderRefundCancelAfter' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
- 'out.outPush' => [\app\listener\out\OutPushListener::class], //对外推送事件
- 'user.userLevel' => [\app\listener\user\UserLevelListener::class], //用户升级事件
- 'user.userVisit' => [\app\listener\user\UserVisitListener::class], //用户访问事件
- 'notice.notice' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
- 'pay.notify' => [\app\listener\pay\NotifyListener::class],//支付异步回调
- 'Crontab' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件
+ 'queueStartListener' => [\app\listener\queue\QueueStartListener::class],
+ 'userLoginListener' => [\app\listener\user\LoginListener::class],
+ 'adminLoginListener' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
+ 'userRegisterListener' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
+ 'wechatAuthListener' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
+ 'orderCreateAfterListener' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
+ 'orderPaySuccessListener' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
+ 'orderDeliveryListener' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
+ 'orderTakeListener' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
+ 'orderRefundCreateAfterListener' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
+ 'orderRefundCancelAfterListener' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
+ 'outPushListener' => [\app\listener\out\OutPushListener::class], //对外推送事件
+ 'userLevelListener' => [\app\listener\user\UserLevelListener::class], //用户升级事件
+ 'userVisitListener' => [\app\listener\user\UserVisitListener::class], //用户访问事件
+ 'noticeListener' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
+ 'notifyListener' => [\app\listener\pay\NotifyListener::class],//支付异步回调
+ 'CrontabListener' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件
],
];
diff --git a/crmeb/app/jobs/UnpaidOrderSend.php b/crmeb/app/jobs/UnpaidOrderSend.php
index 53491173f..329d7909c 100644
--- a/crmeb/app/jobs/UnpaidOrderSend.php
+++ b/crmeb/app/jobs/UnpaidOrderSend.php
@@ -40,7 +40,7 @@ class UnpaidOrderSend extends BaseJobs
return true;
}
//收货给用户发送消息
- event('notice.notice', [['order' => $orderInfo], 'order_pay_false']);
+ event('noticeListener', [['order' => $orderInfo], 'order_pay_false']);
return true;
}
diff --git a/crmeb/app/services/activity/advance/StoreAdvanceServices.php b/crmeb/app/services/activity/advance/StoreAdvanceServices.php
index 64eb561c7..9a17911ac 100644
--- a/crmeb/app/services/activity/advance/StoreAdvanceServices.php
+++ b/crmeb/app/services/activity/advance/StoreAdvanceServices.php
@@ -319,7 +319,7 @@ class StoreAdvanceServices extends BaseServices
$data['productValue'] = $productValue;
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('user.userVisit', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']);
+ event('userVisitListener', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index 916fc5b4d..03dab6e05 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -505,7 +505,7 @@ class StoreBargainServices extends BaseServices
$data['bargain']['price'] = bcsub($data['bargain']['price'], (string)$userBargainInfo['alreadyPrice'], 2);
//用户访问事件
- event('user.userVisit', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
+ event('userVisitListener', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $user['uid'], 'product_id' => $bargain['product_id']]]);
@@ -646,7 +646,7 @@ class StoreBargainServices extends BaseServices
$price = $userHelpService->setBargainRecord($uid, $bargainUserInfo, $bargainInfo);
if ($price) {
if (!$bargainUserService->getSurplusPrice($bargainUserTableId, 1)) {
- event('notice.notice', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
+ event('noticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
}
}
return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 61a5d39c8..0ef600b84 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -425,7 +425,7 @@ class StoreCombinationServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('user.userVisit', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']);
+ event('userVisitListener', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php
index 223390680..aa966d1ab 100644
--- a/crmeb/app/services/activity/combination/StorePinkServices.php
+++ b/crmeb/app/services/activity/combination/StorePinkServices.php
@@ -300,9 +300,9 @@ class StorePinkServices extends BaseServices
{
$pink = $this->dao->getOne([['id|k_id', '=', $pid], ['uid', '=', $uid]], '*', ['getProduct']);
if ($isRemove) {
- event('notice.notice', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']);
+ event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']);
} else {
- event('notice.notice', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']);
+ event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']);
}
$this->dao->update([['id|k_id', '=', $pid]], ['status' => 3, 'stop_time' => time()]);
}
@@ -390,7 +390,7 @@ class StorePinkServices extends BaseServices
foreach ($pinkList as $item) {
$item['nickname'] = $pinkT_name;
//用户发送消息
- event('notice.notice', [
+ event('noticeListener', [
[
'list' => $item,
'title' => $title,
@@ -439,7 +439,7 @@ class StorePinkServices extends BaseServices
$res = $this->save($pink);
}
// 拼团团成功发送模板消息
- event('notice.notice', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']);
+ event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']);
//处理拼团完成
list($pinkAll, $pinkT, $count, $idAll, $uidAll) = $this->getPinkMemberAndPinkK($pink);
@@ -483,7 +483,7 @@ class StorePinkServices extends BaseServices
PinkJob::dispatchSecs((int)(($product->effective_time * 3600) + 60), [$pink['id']]);
// 开团成功发送模板消息
- event('notice.notice', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']);
+ event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']);
if ($res) return true;
else return false;
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index 7f79c4aab..86907587e 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -569,7 +569,7 @@ class StoreSeckillServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('user.userVisit', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']);
+ event('userVisitListener', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php
index 2ccb27a50..5e4df30d6 100644
--- a/crmeb/app/services/order/StoreOrderCreateServices.php
+++ b/crmeb/app/services/order/StoreOrderCreateServices.php
@@ -266,9 +266,9 @@ class StoreOrderCreateServices extends BaseServices
});
// 订单创建成功后置事件
- event('order.orderCreateAfter', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]);
+ event('orderCreateAfterListener', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]);
// 推送订单
- event('out.outPush', ['order_create_push', ['order_id' => (int)$order['id']]]);
+ event('outPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]);
return $order;
}
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 7388aeb1a..5181072a7 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -444,11 +444,11 @@ class StoreOrderDeliveryServices extends BaseServices
switch ($type) {
case 1://快递发货
$this->orderDeliverGoods($id, $data, $orderInfo, $storeName);
- event('notice.notice', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']);
+ event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']);
break;
case 2://配送
$this->orderDelivery($id, $data, $orderInfo, $storeName);
- event('notice.notice', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']);
+ event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']);
break;
case 3://虚拟发货
$this->orderVirtualDelivery($id, $data, $orderInfo, $storeName);
@@ -457,7 +457,7 @@ class StoreOrderDeliveryServices extends BaseServices
throw new AdminException(400522);
}
//到期自动收货
- event('order.orderDelivery', [$orderInfo, $storeName, $data, $type]);
+ event('orderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
return true;
}
diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index 175ad51f4..d130bb618 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -278,7 +278,7 @@ class StoreOrderRefundServices extends BaseServices
app()->make(StoreOrderInvoiceServices::class)->update(['order_id' => $order['id']], ['is_refund' => 1]);
//订单退款记录
ProductLogJob::dispatch(['refund', ['uid' => $order['uid'], 'order_id' => $order['id']]]);
- event('notice.notice', [['data' => $refundData, 'order' => $order], 'order_refund']);
+ event('noticeListener', [['data' => $refundData, 'order' => $order], 'order_refund']);
return true;
}
@@ -599,7 +599,7 @@ class StoreOrderRefundServices extends BaseServices
$capitalFlowServices->setFlow($order, 'refund');
}
- event('notice.notice', [['data' => $data, 'order' => $order], 'order_refund']);
+ event('noticeListener', [['data' => $data, 'order' => $order], 'order_refund']);
}
/**
@@ -693,7 +693,7 @@ class StoreOrderRefundServices extends BaseServices
'change_time' => time()
]);
});
- event('notice.notice', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']);
+ event('noticeListener', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']);
return true;
}
@@ -850,7 +850,7 @@ class StoreOrderRefundServices extends BaseServices
} catch (\Exception $e) {
}
//提醒推送
- event('notice.notice', [['order' => $order], 'send_order_apply_refund']);
+ event('noticeListener', [['order' => $order], 'send_order_apply_refund']);
return true;
@@ -1012,11 +1012,11 @@ class StoreOrderRefundServices extends BaseServices
});
$storeOrderCartInfoServices->clearOrderCartInfo($order['id']);
//申请退款事件
- event('order.orderRefundCreateAfter', [$order]);
+ event('orderRefundCreateAfterListener', [$order]);
//提醒推送
- event('notice.notice', [['order' => $order], 'send_order_apply_refund']);
+ event('noticeListener', [['order' => $order], 'send_order_apply_refund']);
//推送订单
- event('out.outPush', ['refund_create_push', ['order_id' => (int)$order['id']]]);
+ event('outPushListener', ['refund_create_push', ['order_id' => (int)$order['id']]]);
try {
ChannelService::instance()->send('NEW_REFUND_ORDER', ['order_id' => $order['order_id']]);
} catch (\Exception $e) {
@@ -1294,9 +1294,9 @@ class StoreOrderRefundServices extends BaseServices
]);
//售后订单取消后置事件
- event('order.orderRefundCancelAfter', [$orderRefundInfo]);
+ event('orderRefundCancelAfterListener', [$orderRefundInfo]);
// 推送订单
- event('out.outPush', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
+ event('outPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
return true;
}
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index c921dcaa9..121050e17 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -782,7 +782,7 @@ HTML;
if ($res) {
$order = $this->dao->getOne(['id' => $id, 'is_del' => 0]);
//改价短信提醒
- event('notice.notice', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']);
+ event('noticeListener', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']);
return $data['order_id'];
} else {
throw new AdminException(100007);
diff --git a/crmeb/app/services/order/StoreOrderSuccessServices.php b/crmeb/app/services/order/StoreOrderSuccessServices.php
index ef00ad28a..adca65382 100644
--- a/crmeb/app/services/order/StoreOrderSuccessServices.php
+++ b/crmeb/app/services/order/StoreOrderSuccessServices.php
@@ -93,13 +93,13 @@ class StoreOrderSuccessServices extends BaseServices
}
$orderInfo['send_name'] = $orderInfo['real_name'];
//订单支付成功后置事件
- event('order.orderPaySuccess', [$orderInfo]);
+ event('orderPaySuccessListener', [$orderInfo]);
//用户推送消息事件
- event('notice.notice', [$orderInfo, 'order_pay_success']);
+ event('noticeListener', [$orderInfo, 'order_pay_success']);
//支付成功给客服发送消息
- event('notice.notice', [$orderInfo, 'admin_pay_success_code']);
+ event('noticeListener', [$orderInfo, 'admin_pay_success_code']);
// 推送订单
- event('out.outPush', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
+ event('outPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
$res = $res1 && $resPink;
return false !== $res;
}
diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index 72694e597..ee8c5bb6e 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -106,11 +106,11 @@ class StoreOrderTakeServices extends BaseServices
if ($res) {
try {
// 收货成功后置队列
- event('order.orderTake', [$order, $userInfo, $storeTitle]);
+ event('orderTakeListener', [$order, $userInfo, $storeTitle]);
//收货给用户发送消息
- event('notice.notice', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
+ event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
//收货给客服发送消息
- event('notice.notice', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']);
+ event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']);
} catch (\Throwable $exception) {
}
@@ -182,7 +182,7 @@ class StoreOrderTakeServices extends BaseServices
/** @var StoreOrderServices $orderServices */
$orderServices = app()->make(StoreOrderServices::class);
$orderServices->update($order['id'], ['gain_integral' => $give_integral], 'id');
- event('notice.notice', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']);
+ event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']);
return true;
}
return true;
@@ -473,7 +473,7 @@ class StoreOrderTakeServices extends BaseServices
$goodsPrice = $brokeragePrice;
}
//提醒推送
- event('notice.notice', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']);
+ event('noticeListener', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']);
}
@@ -510,7 +510,7 @@ class StoreOrderTakeServices extends BaseServices
}
//用户升级事件
- event('user.userLevel', [$order['uid']]);
+ event('userLevelListener', [$order['uid']]);
return $res;
}
diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php
index 1ea506ab0..4d9720435 100644
--- a/crmeb/app/services/product/product/StoreProductServices.php
+++ b/crmeb/app/services/product/product/StoreProductServices.php
@@ -1393,7 +1393,7 @@ class StoreProductServices extends BaseServices
}
$data['priceName'] = $this->getPacketPrice($storeInfo, $attrValue, $uid);
//用户访问事件
- event('user.userVisit', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
+ event('userVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
}
/** @var StoreProductReplyServices $storeProductReplyService */
diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php
index 75babcecd..febb3aa89 100644
--- a/crmeb/app/services/system/admin/SystemAdminServices.php
+++ b/crmeb/app/services/system/admin/SystemAdminServices.php
@@ -126,7 +126,7 @@ class SystemAdminServices extends BaseServices
[$menus, $uniqueAuth] = $services->getMenusList($adminInfo->roles, (int)$adminInfo['level']);
$remind = Config::get('app.console_remind', false);
if ($remind) {
- [$queue, $timer] = Event::until('admin.login', [$key]);
+ [$queue, $timer] = Event::until('adminLoginListener', [$key]);
}
return [
'token' => $tokenInfo['token'],
diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php
index a948064e9..8b8ce01d9 100644
--- a/crmeb/app/services/user/LoginServices.php
+++ b/crmeb/app/services/user/LoginServices.php
@@ -117,9 +117,9 @@ class LoginServices extends BaseServices
$data['division_id'] = $spreadInfo->division_id;
$data['staff_id'] = $spreadInfo->staff_id;
//绑定用户后置事件
- event('user.register', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
+ event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
- event('notice.notice', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
+ event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
}
} else {
//永久绑定
@@ -141,9 +141,9 @@ class LoginServices extends BaseServices
$data['division_id'] = $spreadInfo->division_id;
$data['staff_id'] = $spreadInfo->staff_id;
//绑定用户后置事件
- event('user.register', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
+ event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
- event('notice.notice', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
+ event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
}
}
}
@@ -234,9 +234,9 @@ class LoginServices extends BaseServices
} else {
$userServices->rewardNewUser((int)$re->uid);
//用户生成后置事件
- event('user.register', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
+ event('userRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
//推送消息
- event('notice.notice', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']);
+ event('noticeListener', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']);
return $re;
}
}
diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php
index b1c20d9f5..4a8545e99 100644
--- a/crmeb/app/services/user/UserBillServices.php
+++ b/crmeb/app/services/user/UserBillServices.php
@@ -667,7 +667,7 @@ class UserBillServices extends BaseServices
//检测会员等级
try {
//用户升级事件
- event('user.userLevel', [$spreadUid]);
+ event('userLevelListener', [$spreadUid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}
diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index 1661a2971..eacac2af4 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -142,7 +142,7 @@ class UserExtractServices extends BaseServices
}
});
- event('notice.notice', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']);
+ event('noticeListener', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']);
return true;
}
@@ -164,7 +164,7 @@ class UserExtractServices extends BaseServices
$userType = $userServices->value(['uid' => $userExtract['uid']], 'user_type');
$nickname = $userServices->value(['uid' => $userExtract['uid']], 'nickname');
$phone = $userServices->value(['uid' => $userExtract['uid']], 'phone');
- event('notice.notice', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']);
+ event('noticeListener', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']);
if (!$this->dao->update($id, ['status' => 1])) {
throw new AdminException(100007);
@@ -511,7 +511,7 @@ class UserExtractServices extends BaseServices
$systemAdmin = app()->make(SystemAdminServices::class);
$systemAdmin->adminNewPush();
//消息
- event('notice.notice', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
+ event('noticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
return true;
}
diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index 33ec3b99e..7ea02349e 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -278,7 +278,7 @@ class UserRechargeServices extends BaseServices
$userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id);
//提醒推送
- event('notice.notice', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
+ event('noticeListener', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
return true;
}
@@ -471,7 +471,7 @@ class UserRechargeServices extends BaseServices
$capitalFlowServices->setFlow($order, 'recharge');
//提醒推送
- event('notice.notice', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
+ event('noticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
return true;
}
diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php
index 2b096a577..435438b6f 100644
--- a/crmeb/app/services/user/UserServices.php
+++ b/crmeb/app/services/user/UserServices.php
@@ -139,9 +139,9 @@ class UserServices extends BaseServices
//新用户注册奖励
$this->rewardNewUser((int)$res->uid);
//用户生成后置事件
- event('user.register', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
+ event('userRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
//推送消息
- event('notice.notice', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']);
+ event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']);
return $res;
}
@@ -775,7 +775,7 @@ class UserServices extends BaseServices
}
$res1 = $userMoneyServices->income('system_sub', $user['uid'], $data['money'], $edit['now_money'], $data['adminId'] ?? 0);
}
- event('out.outPush', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]);
+ event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]);
} else {
$res1 = true;
}
@@ -796,7 +796,7 @@ class UserServices extends BaseServices
$integral_data['mark'] = '系统扣除了' . floatval($data['integration']) . '积分';
$res2 = $userBill->expendIntegral($user['uid'], 'system_sub', $integral_data);
}
- event('out.outPush', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]);
+ event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]);
} else {
$res2 = true;
}
diff --git a/crmeb/app/services/user/UserSignServices.php b/crmeb/app/services/user/UserSignServices.php
index 94f12e110..247baac53 100644
--- a/crmeb/app/services/user/UserSignServices.php
+++ b/crmeb/app/services/user/UserSignServices.php
@@ -93,7 +93,7 @@ class UserSignServices extends BaseServices
//检测会员等级
try {
//用户升级事件
- event('user.userLevel', [$uid]);
+ event('userLevelListener', [$uid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}
diff --git a/crmeb/crmeb/command/Timer.php b/crmeb/crmeb/command/Timer.php
index 28435587c..bf2fbfdf0 100644
--- a/crmeb/crmeb/command/Timer.php
+++ b/crmeb/crmeb/command/Timer.php
@@ -62,7 +62,7 @@ class Timer extends Command
date_default_timezone_set('PRC');
$task->count = 1;
$task->onWorkerStart = function () {
- event('Crontab');
+ event('CrontabListener');
};
$task->runAll();
}
diff --git a/crmeb/crmeb/services/AliPayService.php b/crmeb/crmeb/services/AliPayService.php
index fb011f4e2..d1b1c576f 100644
--- a/crmeb/crmeb/services/AliPayService.php
+++ b/crmeb/crmeb/services/AliPayService.php
@@ -209,7 +209,7 @@ class AliPayService
'transaction_id' => $notify->trade_no
];
- return Event::until('pay.notify', [$data, PayServices::ALIAPY_PAY]);
+ return Event::until('notifyListener', [$data, PayServices::ALIAPY_PAY]);
}
return false;
});
diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php
index 47ec270a1..7b248ce05 100644
--- a/crmeb/crmeb/services/app/WechatService.php
+++ b/crmeb/crmeb/services/app/WechatService.php
@@ -174,7 +174,7 @@ class WechatService
$data['out_trade_no'] = $message['order_info']['trade_no'];
$data['transaction_id'] = $message['order_info']['transaction_id'];
$data['opneid'] = $message['FromUserName'];
- if (Event::until('pay.notify', [$data, PayServices::WEIXIN_PAY])) {
+ if (Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY])) {
$response = 'success';
} else {
$response = 'faild';
@@ -635,7 +635,7 @@ class WechatService
'transaction_id' => $notify->transaction_id
];
- return Event::until('pay.notify', [$data, PayServices::WEIXIN_PAY]);
+ return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;
diff --git a/crmeb/crmeb/services/pay/storage/AllinPay.php b/crmeb/crmeb/services/pay/storage/AllinPay.php
index 33b561dbe..cc96f2116 100644
--- a/crmeb/crmeb/services/pay/storage/AllinPay.php
+++ b/crmeb/crmeb/services/pay/storage/AllinPay.php
@@ -147,7 +147,7 @@ class AllinPay extends BasePay implements PayInterface
'transaction_id' => $notify['trxid']
];
- return Event::until('pay.notify', [$data, PayServices::ALLIN_PAY]);
+ return Event::until('notifyListener', [$data, PayServices::ALLIN_PAY]);
}
return false;
});
diff --git a/crmeb/crmeb/services/pay/storage/V3WechatPay.php b/crmeb/crmeb/services/pay/storage/V3WechatPay.php
index b07fb4182..c3c2308d3 100644
--- a/crmeb/crmeb/services/pay/storage/V3WechatPay.php
+++ b/crmeb/crmeb/services/pay/storage/V3WechatPay.php
@@ -210,7 +210,7 @@ class V3WechatPay extends BasePay implements PayInterface
'transaction_id' => $notify->transaction_id
];
- return Event::until('pay.notify', [$data, PayServices::WEIXIN_PAY]);
+ return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;
diff --git a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
index 4769413b4..8296fc735 100644
--- a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
+++ b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
@@ -56,7 +56,7 @@ class Listen extends Command
$sleep = $input->getOption('sleep');
$tries = $input->getOption('tries');
- $this->app->event->trigger('queue.start', [$output]);
+ $this->app->event->trigger('queueStartListener', [$output]);
$this->listener->listen($connection, $queue, $delay, $sleep, $tries, $memory, $timeout);
}
From 8d31a6499b491eb9aecf4d896764e9d400936a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 18:31:30 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F?=
=?UTF-8?q?=E4=BA=8B=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96file=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=E4=B8=8B=E7=9A=84=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/v1/order/StoreOrder.php | 2 +-
crmeb/app/event.php | 32 +++++++++----------
crmeb/app/jobs/UnpaidOrderSend.php | 2 +-
.../activity/advance/StoreAdvanceServices.php | 2 +-
.../activity/bargain/StoreBargainServices.php | 4 +--
.../combination/StoreCombinationServices.php | 2 +-
.../combination/StorePinkServices.php | 10 +++---
.../activity/seckill/StoreSeckillServices.php | 2 +-
.../order/StoreOrderCreateServices.php | 10 ++++--
.../order/StoreOrderDeliveryServices.php | 6 ++--
.../order/StoreOrderRefundServices.php | 18 +++++------
.../app/services/order/StoreOrderServices.php | 2 +-
.../order/StoreOrderSuccessServices.php | 8 ++---
.../services/order/StoreOrderTakeServices.php | 12 +++----
.../product/product/StoreProductServices.php | 2 +-
.../system/admin/SystemAdminServices.php | 2 +-
crmeb/app/services/user/LoginServices.php | 12 +++----
crmeb/app/services/user/UserBillServices.php | 2 +-
.../app/services/user/UserExtractServices.php | 6 ++--
.../services/user/UserRechargeServices.php | 4 +--
crmeb/app/services/user/UserServices.php | 8 ++---
crmeb/app/services/user/UserSignServices.php | 2 +-
crmeb/crmeb/services/AliPayService.php | 2 +-
crmeb/crmeb/services/app/WechatService.php | 4 +--
crmeb/crmeb/services/pay/storage/AllinPay.php | 2 +-
.../services/pay/storage/V3WechatPay.php | 2 +-
.../think-queue/src/queue/command/Listen.php | 2 +-
27 files changed, 84 insertions(+), 78 deletions(-)
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
index 97a7740fe..25835f3c5 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
@@ -591,7 +591,7 @@ class StoreOrder extends AuthController
}
$services->storeProductOrderRefundNo((int)$id, $refund_reason);
//提醒推送
- event('noticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
+ event('NoticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
return app('json')->success(100010);
}
diff --git a/crmeb/app/event.php b/crmeb/app/event.php
index 044fd7c4d..0f2874b64 100644
--- a/crmeb/app/event.php
+++ b/crmeb/app/event.php
@@ -22,22 +22,22 @@ return [
'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件
'LogLevel' => [],
'LogWrite' => [],
- 'queueStartListener' => [\app\listener\queue\QueueStartListener::class],
- 'userLoginListener' => [\app\listener\user\LoginListener::class],
- 'adminLoginListener' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
- 'userRegisterListener' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
- 'wechatAuthListener' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
- 'orderCreateAfterListener' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
- 'orderPaySuccessListener' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
- 'orderDeliveryListener' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
- 'orderTakeListener' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
- 'orderRefundCreateAfterListener' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
- 'orderRefundCancelAfterListener' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
- 'outPushListener' => [\app\listener\out\OutPushListener::class], //对外推送事件
- 'userLevelListener' => [\app\listener\user\UserLevelListener::class], //用户升级事件
- 'userVisitListener' => [\app\listener\user\UserVisitListener::class], //用户访问事件
- 'noticeListener' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
- 'notifyListener' => [\app\listener\pay\NotifyListener::class],//支付异步回调
+ 'QueueStartListener' => [\app\listener\queue\QueueStartListener::class],
+ 'UserLoginListener' => [\app\listener\user\LoginListener::class],
+ 'AdminLoginListener' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
+ 'UserRegisterListener' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
+ 'WechatAuthListener' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
+ 'OrderCreateAfterListener' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
+ 'OrderPaySuccessListener' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
+ 'OrderDeliveryListener' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
+ 'OrderTakeListener' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
+ 'OrderRefundCreateAfterListener' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
+ 'OrderRefundCancelAfterListener' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
+ 'OutPushListener' => [\app\listener\out\OutPushListener::class], //对外推送事件
+ 'UserLevelListener' => [\app\listener\user\UserLevelListener::class], //用户升级事件
+ 'UserVisitListener' => [\app\listener\user\UserVisitListener::class], //用户访问事件
+ 'NoticeListener' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
+ 'NotifyListener' => [\app\listener\pay\NotifyListener::class],//支付异步回调
'CrontabListener' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件
],
];
diff --git a/crmeb/app/jobs/UnpaidOrderSend.php b/crmeb/app/jobs/UnpaidOrderSend.php
index 329d7909c..a6dd5126d 100644
--- a/crmeb/app/jobs/UnpaidOrderSend.php
+++ b/crmeb/app/jobs/UnpaidOrderSend.php
@@ -40,7 +40,7 @@ class UnpaidOrderSend extends BaseJobs
return true;
}
//收货给用户发送消息
- event('noticeListener', [['order' => $orderInfo], 'order_pay_false']);
+ event('NoticeListener', [['order' => $orderInfo], 'order_pay_false']);
return true;
}
diff --git a/crmeb/app/services/activity/advance/StoreAdvanceServices.php b/crmeb/app/services/activity/advance/StoreAdvanceServices.php
index 9a17911ac..45c4e3b87 100644
--- a/crmeb/app/services/activity/advance/StoreAdvanceServices.php
+++ b/crmeb/app/services/activity/advance/StoreAdvanceServices.php
@@ -319,7 +319,7 @@ class StoreAdvanceServices extends BaseServices
$data['productValue'] = $productValue;
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('userVisitListener', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']);
+ event('UserVisitListener', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index 03dab6e05..261114b81 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -505,7 +505,7 @@ class StoreBargainServices extends BaseServices
$data['bargain']['price'] = bcsub($data['bargain']['price'], (string)$userBargainInfo['alreadyPrice'], 2);
//用户访问事件
- event('userVisitListener', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
+ event('UserVisitListener', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $user['uid'], 'product_id' => $bargain['product_id']]]);
@@ -646,7 +646,7 @@ class StoreBargainServices extends BaseServices
$price = $userHelpService->setBargainRecord($uid, $bargainUserInfo, $bargainInfo);
if ($price) {
if (!$bargainUserService->getSurplusPrice($bargainUserTableId, 1)) {
- event('noticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
+ event('NoticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
}
}
return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 0ef600b84..501d370d5 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -425,7 +425,7 @@ class StoreCombinationServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('userVisitListener', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']);
+ event('UserVisitListener', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php
index aa966d1ab..11c12f810 100644
--- a/crmeb/app/services/activity/combination/StorePinkServices.php
+++ b/crmeb/app/services/activity/combination/StorePinkServices.php
@@ -300,9 +300,9 @@ class StorePinkServices extends BaseServices
{
$pink = $this->dao->getOne([['id|k_id', '=', $pid], ['uid', '=', $uid]], '*', ['getProduct']);
if ($isRemove) {
- event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']);
+ event('NoticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']);
} else {
- event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']);
+ event('NoticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']);
}
$this->dao->update([['id|k_id', '=', $pid]], ['status' => 3, 'stop_time' => time()]);
}
@@ -390,7 +390,7 @@ class StorePinkServices extends BaseServices
foreach ($pinkList as $item) {
$item['nickname'] = $pinkT_name;
//用户发送消息
- event('noticeListener', [
+ event('NoticeListener', [
[
'list' => $item,
'title' => $title,
@@ -439,7 +439,7 @@ class StorePinkServices extends BaseServices
$res = $this->save($pink);
}
// 拼团团成功发送模板消息
- event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']);
+ event('NoticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']);
//处理拼团完成
list($pinkAll, $pinkT, $count, $idAll, $uidAll) = $this->getPinkMemberAndPinkK($pink);
@@ -483,7 +483,7 @@ class StorePinkServices extends BaseServices
PinkJob::dispatchSecs((int)(($product->effective_time * 3600) + 60), [$pink['id']]);
// 开团成功发送模板消息
- event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']);
+ event('NoticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']);
if ($res) return true;
else return false;
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index 86907587e..0e0e54014 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -569,7 +569,7 @@ class StoreSeckillServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
- event('userVisitListener', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']);
+ event('UserVisitListener', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']);
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]);
return $data;
diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php
index 5e4df30d6..a00fc1665 100644
--- a/crmeb/app/services/order/StoreOrderCreateServices.php
+++ b/crmeb/app/services/order/StoreOrderCreateServices.php
@@ -70,6 +70,12 @@ class StoreOrderCreateServices extends BaseServices
} else {
$id = $snowflake->setStartTimeStamp(strtotime('2022-01-01') * 1000)->id();
}
+ $replace = '';
+ $chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+ for ($i = 0; $i < 3; $i++) {
+ $replace .= $chars[mt_rand(0, strlen($chars) - 1)];
+ }
+ $id = substr_replace($id, $replace, -3);
} else {
$is_callable = function ($currentTime) {
$redis = Cache::store('redis');
@@ -266,9 +272,9 @@ class StoreOrderCreateServices extends BaseServices
});
// 订单创建成功后置事件
- event('orderCreateAfterListener', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]);
+ event('OrderCreateAfterListener', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]);
// 推送订单
- event('outPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]);
+ event('OutPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]);
return $order;
}
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 5181072a7..da2b3d109 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -444,11 +444,11 @@ class StoreOrderDeliveryServices extends BaseServices
switch ($type) {
case 1://快递发货
$this->orderDeliverGoods($id, $data, $orderInfo, $storeName);
- event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']);
+ event('NoticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']);
break;
case 2://配送
$this->orderDelivery($id, $data, $orderInfo, $storeName);
- event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']);
+ event('NoticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']);
break;
case 3://虚拟发货
$this->orderVirtualDelivery($id, $data, $orderInfo, $storeName);
@@ -457,7 +457,7 @@ class StoreOrderDeliveryServices extends BaseServices
throw new AdminException(400522);
}
//到期自动收货
- event('orderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
+ event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
return true;
}
diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index d130bb618..70f309414 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -278,7 +278,7 @@ class StoreOrderRefundServices extends BaseServices
app()->make(StoreOrderInvoiceServices::class)->update(['order_id' => $order['id']], ['is_refund' => 1]);
//订单退款记录
ProductLogJob::dispatch(['refund', ['uid' => $order['uid'], 'order_id' => $order['id']]]);
- event('noticeListener', [['data' => $refundData, 'order' => $order], 'order_refund']);
+ event('NoticeListener', [['data' => $refundData, 'order' => $order], 'order_refund']);
return true;
}
@@ -599,7 +599,7 @@ class StoreOrderRefundServices extends BaseServices
$capitalFlowServices->setFlow($order, 'refund');
}
- event('noticeListener', [['data' => $data, 'order' => $order], 'order_refund']);
+ event('NoticeListener', [['data' => $data, 'order' => $order], 'order_refund']);
}
/**
@@ -693,7 +693,7 @@ class StoreOrderRefundServices extends BaseServices
'change_time' => time()
]);
});
- event('noticeListener', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']);
+ event('NoticeListener', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']);
return true;
}
@@ -850,7 +850,7 @@ class StoreOrderRefundServices extends BaseServices
} catch (\Exception $e) {
}
//提醒推送
- event('noticeListener', [['order' => $order], 'send_order_apply_refund']);
+ event('NoticeListener', [['order' => $order], 'send_order_apply_refund']);
return true;
@@ -1012,11 +1012,11 @@ class StoreOrderRefundServices extends BaseServices
});
$storeOrderCartInfoServices->clearOrderCartInfo($order['id']);
//申请退款事件
- event('orderRefundCreateAfterListener', [$order]);
+ event('OrderRefundCreateAfterListener', [$order]);
//提醒推送
- event('noticeListener', [['order' => $order], 'send_order_apply_refund']);
+ event('NoticeListener', [['order' => $order], 'send_order_apply_refund']);
//推送订单
- event('outPushListener', ['refund_create_push', ['order_id' => (int)$order['id']]]);
+ event('OutPushListener', ['refund_create_push', ['order_id' => (int)$order['id']]]);
try {
ChannelService::instance()->send('NEW_REFUND_ORDER', ['order_id' => $order['order_id']]);
} catch (\Exception $e) {
@@ -1294,9 +1294,9 @@ class StoreOrderRefundServices extends BaseServices
]);
//售后订单取消后置事件
- event('orderRefundCancelAfterListener', [$orderRefundInfo]);
+ event('OrderRefundCancelAfterListener', [$orderRefundInfo]);
// 推送订单
- event('outPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
+ event('OutPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
return true;
}
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index 121050e17..3dc91b255 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -782,7 +782,7 @@ HTML;
if ($res) {
$order = $this->dao->getOne(['id' => $id, 'is_del' => 0]);
//改价短信提醒
- event('noticeListener', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']);
+ event('NoticeListener', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']);
return $data['order_id'];
} else {
throw new AdminException(100007);
diff --git a/crmeb/app/services/order/StoreOrderSuccessServices.php b/crmeb/app/services/order/StoreOrderSuccessServices.php
index adca65382..6c698238b 100644
--- a/crmeb/app/services/order/StoreOrderSuccessServices.php
+++ b/crmeb/app/services/order/StoreOrderSuccessServices.php
@@ -93,13 +93,13 @@ class StoreOrderSuccessServices extends BaseServices
}
$orderInfo['send_name'] = $orderInfo['real_name'];
//订单支付成功后置事件
- event('orderPaySuccessListener', [$orderInfo]);
+ event('OrderPaySuccessListener', [$orderInfo]);
//用户推送消息事件
- event('noticeListener', [$orderInfo, 'order_pay_success']);
+ event('NoticeListener', [$orderInfo, 'order_pay_success']);
//支付成功给客服发送消息
- event('noticeListener', [$orderInfo, 'admin_pay_success_code']);
+ event('NoticeListener', [$orderInfo, 'admin_pay_success_code']);
// 推送订单
- event('outPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
+ event('OutPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
$res = $res1 && $resPink;
return false !== $res;
}
diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index ee8c5bb6e..7e98b8060 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -106,11 +106,11 @@ class StoreOrderTakeServices extends BaseServices
if ($res) {
try {
// 收货成功后置队列
- event('orderTakeListener', [$order, $userInfo, $storeTitle]);
+ event('OrderTakeListener', [$order, $userInfo, $storeTitle]);
//收货给用户发送消息
- event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
+ event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
//收货给客服发送消息
- event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']);
+ event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']);
} catch (\Throwable $exception) {
}
@@ -182,7 +182,7 @@ class StoreOrderTakeServices extends BaseServices
/** @var StoreOrderServices $orderServices */
$orderServices = app()->make(StoreOrderServices::class);
$orderServices->update($order['id'], ['gain_integral' => $give_integral], 'id');
- event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']);
+ event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']);
return true;
}
return true;
@@ -473,7 +473,7 @@ class StoreOrderTakeServices extends BaseServices
$goodsPrice = $brokeragePrice;
}
//提醒推送
- event('noticeListener', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']);
+ event('NoticeListener', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']);
}
@@ -510,7 +510,7 @@ class StoreOrderTakeServices extends BaseServices
}
//用户升级事件
- event('userLevelListener', [$order['uid']]);
+ event('UserLevelListener', [$order['uid']]);
return $res;
}
diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php
index 4d9720435..3ac57dfb6 100644
--- a/crmeb/app/services/product/product/StoreProductServices.php
+++ b/crmeb/app/services/product/product/StoreProductServices.php
@@ -1393,7 +1393,7 @@ class StoreProductServices extends BaseServices
}
$data['priceName'] = $this->getPacketPrice($storeInfo, $attrValue, $uid);
//用户访问事件
- event('userVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
+ event('UserVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
}
/** @var StoreProductReplyServices $storeProductReplyService */
diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php
index febb3aa89..8c3b4209e 100644
--- a/crmeb/app/services/system/admin/SystemAdminServices.php
+++ b/crmeb/app/services/system/admin/SystemAdminServices.php
@@ -126,7 +126,7 @@ class SystemAdminServices extends BaseServices
[$menus, $uniqueAuth] = $services->getMenusList($adminInfo->roles, (int)$adminInfo['level']);
$remind = Config::get('app.console_remind', false);
if ($remind) {
- [$queue, $timer] = Event::until('adminLoginListener', [$key]);
+ [$queue, $timer] = Event::until('AdminLoginListener', [$key]);
}
return [
'token' => $tokenInfo['token'],
diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php
index 8b8ce01d9..9b14ab8a4 100644
--- a/crmeb/app/services/user/LoginServices.php
+++ b/crmeb/app/services/user/LoginServices.php
@@ -117,9 +117,9 @@ class LoginServices extends BaseServices
$data['division_id'] = $spreadInfo->division_id;
$data['staff_id'] = $spreadInfo->staff_id;
//绑定用户后置事件
- event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
+ event('UserRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
- event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
+ event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
}
} else {
//永久绑定
@@ -141,9 +141,9 @@ class LoginServices extends BaseServices
$data['division_id'] = $spreadInfo->division_id;
$data['staff_id'] = $spreadInfo->staff_id;
//绑定用户后置事件
- event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
+ event('UserRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
- event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
+ event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']);
}
}
}
@@ -234,9 +234,9 @@ class LoginServices extends BaseServices
} else {
$userServices->rewardNewUser((int)$re->uid);
//用户生成后置事件
- event('userRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
+ event('UserRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
//推送消息
- event('noticeListener', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']);
+ event('NoticeListener', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']);
return $re;
}
}
diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php
index 4a8545e99..719ee97fd 100644
--- a/crmeb/app/services/user/UserBillServices.php
+++ b/crmeb/app/services/user/UserBillServices.php
@@ -667,7 +667,7 @@ class UserBillServices extends BaseServices
//检测会员等级
try {
//用户升级事件
- event('userLevelListener', [$spreadUid]);
+ event('UserLevelListener', [$spreadUid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}
diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index eacac2af4..d8b330c0f 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -142,7 +142,7 @@ class UserExtractServices extends BaseServices
}
});
- event('noticeListener', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']);
+ event('NoticeListener', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']);
return true;
}
@@ -164,7 +164,7 @@ class UserExtractServices extends BaseServices
$userType = $userServices->value(['uid' => $userExtract['uid']], 'user_type');
$nickname = $userServices->value(['uid' => $userExtract['uid']], 'nickname');
$phone = $userServices->value(['uid' => $userExtract['uid']], 'phone');
- event('noticeListener', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']);
+ event('NoticeListener', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']);
if (!$this->dao->update($id, ['status' => 1])) {
throw new AdminException(100007);
@@ -511,7 +511,7 @@ class UserExtractServices extends BaseServices
$systemAdmin = app()->make(SystemAdminServices::class);
$systemAdmin->adminNewPush();
//消息
- event('noticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
+ event('NoticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
return true;
}
diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index 7ea02349e..ec2916c13 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -278,7 +278,7 @@ class UserRechargeServices extends BaseServices
$userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id);
//提醒推送
- event('noticeListener', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
+ event('NoticeListener', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
return true;
}
@@ -471,7 +471,7 @@ class UserRechargeServices extends BaseServices
$capitalFlowServices->setFlow($order, 'recharge');
//提醒推送
- event('noticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
+ event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
return true;
}
diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php
index 435438b6f..ffaefd0d8 100644
--- a/crmeb/app/services/user/UserServices.php
+++ b/crmeb/app/services/user/UserServices.php
@@ -139,9 +139,9 @@ class UserServices extends BaseServices
//新用户注册奖励
$this->rewardNewUser((int)$res->uid);
//用户生成后置事件
- event('userRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
+ event('UserRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
//推送消息
- event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']);
+ event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']);
return $res;
}
@@ -775,7 +775,7 @@ class UserServices extends BaseServices
}
$res1 = $userMoneyServices->income('system_sub', $user['uid'], $data['money'], $edit['now_money'], $data['adminId'] ?? 0);
}
- event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]);
+ event('OutPushListener', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]);
} else {
$res1 = true;
}
@@ -796,7 +796,7 @@ class UserServices extends BaseServices
$integral_data['mark'] = '系统扣除了' . floatval($data['integration']) . '积分';
$res2 = $userBill->expendIntegral($user['uid'], 'system_sub', $integral_data);
}
- event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]);
+ event('OutPushListener', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]);
} else {
$res2 = true;
}
diff --git a/crmeb/app/services/user/UserSignServices.php b/crmeb/app/services/user/UserSignServices.php
index 247baac53..b3d8c8de4 100644
--- a/crmeb/app/services/user/UserSignServices.php
+++ b/crmeb/app/services/user/UserSignServices.php
@@ -93,7 +93,7 @@ class UserSignServices extends BaseServices
//检测会员等级
try {
//用户升级事件
- event('userLevelListener', [$uid]);
+ event('UserLevelListener', [$uid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}
diff --git a/crmeb/crmeb/services/AliPayService.php b/crmeb/crmeb/services/AliPayService.php
index d1b1c576f..aab7e43ca 100644
--- a/crmeb/crmeb/services/AliPayService.php
+++ b/crmeb/crmeb/services/AliPayService.php
@@ -209,7 +209,7 @@ class AliPayService
'transaction_id' => $notify->trade_no
];
- return Event::until('notifyListener', [$data, PayServices::ALIAPY_PAY]);
+ return Event::until('NotifyListener', [$data, PayServices::ALIAPY_PAY]);
}
return false;
});
diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php
index 7b248ce05..d1f15b2d9 100644
--- a/crmeb/crmeb/services/app/WechatService.php
+++ b/crmeb/crmeb/services/app/WechatService.php
@@ -174,7 +174,7 @@ class WechatService
$data['out_trade_no'] = $message['order_info']['trade_no'];
$data['transaction_id'] = $message['order_info']['transaction_id'];
$data['opneid'] = $message['FromUserName'];
- if (Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY])) {
+ if (Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY])) {
$response = 'success';
} else {
$response = 'faild';
@@ -635,7 +635,7 @@ class WechatService
'transaction_id' => $notify->transaction_id
];
- return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
+ return Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;
diff --git a/crmeb/crmeb/services/pay/storage/AllinPay.php b/crmeb/crmeb/services/pay/storage/AllinPay.php
index cc96f2116..b756f3357 100644
--- a/crmeb/crmeb/services/pay/storage/AllinPay.php
+++ b/crmeb/crmeb/services/pay/storage/AllinPay.php
@@ -147,7 +147,7 @@ class AllinPay extends BasePay implements PayInterface
'transaction_id' => $notify['trxid']
];
- return Event::until('notifyListener', [$data, PayServices::ALLIN_PAY]);
+ return Event::until('NotifyListener', [$data, PayServices::ALLIN_PAY]);
}
return false;
});
diff --git a/crmeb/crmeb/services/pay/storage/V3WechatPay.php b/crmeb/crmeb/services/pay/storage/V3WechatPay.php
index c3c2308d3..31a5bbdc5 100644
--- a/crmeb/crmeb/services/pay/storage/V3WechatPay.php
+++ b/crmeb/crmeb/services/pay/storage/V3WechatPay.php
@@ -210,7 +210,7 @@ class V3WechatPay extends BasePay implements PayInterface
'transaction_id' => $notify->transaction_id
];
- return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
+ return Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;
diff --git a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
index 8296fc735..8f8e19d33 100644
--- a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
+++ b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php
@@ -56,7 +56,7 @@ class Listen extends Command
$sleep = $input->getOption('sleep');
$tries = $input->getOption('tries');
- $this->app->event->trigger('queueStartListener', [$output]);
+ $this->app->event->trigger('QueueStartListener', [$output]);
$this->listener->listen($connection, $queue, $delay, $sleep, $tries, $memory, $timeout);
}
From bf98ee013cbe14ae1a864945ac0daafb7036c0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 18:38:02 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E6=8F=90=E9=86=92=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=96=87?=
=?UTF-8?q?=E6=A1=A3=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/admin/src/pages/account/login/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index 6ba858d40..6566b749a 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -231,7 +231,7 @@ export default {
if (data.timer === false) {
this.$Notice.warning({
title: '温馨提示',
- desc: '您的【定时任务】未开启，没有开启会导致自动收货、未支付自动取消订单、订单自动好评、拼团到期退款等任务无法正常执行。请尽快执行命令开启！！点击查看开启方法',
+ desc: '您的【定时任务】未开启，没有开启会导致自动收货、未支付自动取消订单、订单自动好评、拼团到期退款等任务无法正常执行。请尽快执行命令开启！！点击查看开启方法',
duration: 30,
});
}
From e4cc54600d22aed6f324e1aad97f57ec2cf6e78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 09:32:32 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=A0=E7=94=A8=E6=8F=90=E9=86=92=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A4=84=E7=90=86=E7=94=B3=E8=AF=B7=E4=BB=A3?=
=?UTF-8?q?=E7=90=86=E5=95=86=E6=9C=AA=E5=A1=AB=E5=86=99=E9=82=80=E8=AF=B7?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/controller/v1/user/DivisionController.php | 1 +
crmeb/public/install/crmeb.sql | 12 +++++++++++-
template/uni-app/pages/admin/orderList/index.vue | 3 ---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/crmeb/app/api/controller/v1/user/DivisionController.php b/crmeb/app/api/controller/v1/user/DivisionController.php
index 4eaaab666..eedd753a2 100644
--- a/crmeb/app/api/controller/v1/user/DivisionController.php
+++ b/crmeb/app/api/controller/v1/user/DivisionController.php
@@ -42,6 +42,7 @@ class DivisionController
]);
$verifyCode = CacheService::get('code_' . $data['phone']);
if ($verifyCode != $data['code']) return app('json')->fail(410010);
+ if ($data['division_invite'] == 0) return app('json')->fail(500028);
$this->services->applyAgent($data, $id);
return app('json')->success(100017);
}
diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql
index e83098739..33b1e2d0a 100755
--- a/crmeb/public/install/crmeb.sql
+++ b/crmeb/public/install/crmeb.sql
@@ -26510,7 +26510,17 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`,
(24967, 7, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', '미결제 주문이 있습니다. 주문 번호: {:order_id}, 상품 수량이 제한되어 있습니다. 제시간에 결제하세요.', 1),
(24968, 8, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Танд төлөгдөөгүй захиалга байна, захиалгын дугаар: {:order_id}, барааны тоо хязгаартай тул цаг тухайд нь төлнө үү.', 1),
(24969, 9, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'คุณมีคำสั่งซื้อที่ยังไม่ได้ชำระเงิน หมายเลขคำสั่งซื้อคือ: {:order_id} สินค้ามีจำนวนจำกัด โปรดชำระเงินให้ตรงเวลา', 1),
-(24970, 10, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Bạn có đơn hàng chưa thanh toán, số đơn hàng là: {:order_id}, số lượng hàng có hạn, vui lòng thanh toán kịp thời.', 1);
+(24970, 10, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Bạn có đơn hàng chưa thanh toán, số đơn hàng là: {:order_id}, số lượng hàng có hạn, vui lòng thanh toán kịp thời.', 1),
+(24971, 1, '500028', '请填写邀请码', '请填写邀请码', 1),
+(24972, 2, '500028', '请填写邀请码', 'Please fill in the invitation code', 1),
+(24973, 3, '500028', '请填写邀请码', '請填寫邀請碼', 1),
+(24974, 4, '500028', '请填写邀请码', 'Merci de remplir le code dinvitation', 1),
+(24975, 5, '500028', '请填写邀请码', 'Si prega di compilare il codice di invito', 1),
+(24976, 6, '500028', '请填写邀请码', '招待状を記入してください', 1),
+(24977, 7, '500028', '请填写邀请码', '초대 코드를 입력하십시오.', 1),
+(24978, 8, '500028', '请填写邀请码', 'Урилгын кодыг бөглөнө үү', 1),
+(24979, 9, '500028', '请填写邀请码', 'กรุณากรอกรหัสเชิญ', 1),
+(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1);
-- --------------------------------------------------------
diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue
index 8f8ec9e5c..fb3d83fd1 100644
--- a/template/uni-app/pages/admin/orderList/index.vue
+++ b/template/uni-app/pages/admin/orderList/index.vue
@@ -177,9 +177,6 @@
},
searchBut() {
let that = this;
- if (!that.where.keywords.trim()) return this.$util.Tips({
- title: that.$t(`请输入要搜索的商品`)
- });
that.focus = false;
that.where.page = 1;
that.loading = false;
From 54d6c259ded11865a458a5ac746d12b4dbabc5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 09:32:46 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/system/crontab/SystemCrontabServices.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/system/crontab/SystemCrontabServices.php b/crmeb/app/services/system/crontab/SystemCrontabServices.php
index 9570cbfae..5dd23568f 100644
--- a/crmeb/app/services/system/crontab/SystemCrontabServices.php
+++ b/crmeb/app/services/system/crontab/SystemCrontabServices.php
@@ -208,7 +208,7 @@ class SystemCrontabServices extends BaseServices
file_put_contents(root_path() . 'runtime/.timer', time()); //检测定时任务是否正常
$list = $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray();
foreach ($list as $item) {
- if ($item['next_execution_time'] < $time) {
+ if ($item['next_execution_time'] < time()) {
if ($item['mark'] == 'order_cancel') {
//未支付自动取消订单
app()->make(StoreOrderServices::class)->orderUnpaidCancel();
From 7dc61c944863be4ad3cb2549f8b395922e95ae93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 10:06:51 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=B4=E6=8E=A5=E8=AE=BF=E9=97=AE=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E7=9A=84time=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/system/crontab/SystemCrontabServices.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/crmeb/app/services/system/crontab/SystemCrontabServices.php b/crmeb/app/services/system/crontab/SystemCrontabServices.php
index 5dd23568f..3bba16f7c 100644
--- a/crmeb/app/services/system/crontab/SystemCrontabServices.php
+++ b/crmeb/app/services/system/crontab/SystemCrontabServices.php
@@ -205,10 +205,11 @@ class SystemCrontabServices extends BaseServices
*/
public function crontabRun()
{
- file_put_contents(root_path() . 'runtime/.timer', time()); //检测定时任务是否正常
+ $time = time();
+ file_put_contents(root_path() . 'runtime/.timer', $time); //检测定时任务是否正常
$list = $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray();
foreach ($list as $item) {
- if ($item['next_execution_time'] < time()) {
+ if ($item['next_execution_time'] < $time) {
if ($item['mark'] == 'order_cancel') {
//未支付自动取消订单
app()->make(StoreOrderServices::class)->orderUnpaidCancel();
From 99930722e8680da6d62fd7df99a1910a9f2bf28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 11:03:03 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=86=E5=88=86?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/order/StoreOrderSplitServices.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crmeb/app/services/order/StoreOrderSplitServices.php b/crmeb/app/services/order/StoreOrderSplitServices.php
index 0178fa40e..8950205d3 100644
--- a/crmeb/app/services/order/StoreOrderSplitServices.php
+++ b/crmeb/app/services/order/StoreOrderSplitServices.php
@@ -85,7 +85,7 @@ class StoreOrderSplitServices extends BaseServices
if (empty($cart_ids_arr['other'])) return [$old_order, ['id' => 0]];
return $this->transaction(function () use ($id, $cart_ids_arr, $orderInfo, $orderInfoOld, $cartInfo, $storeOrderCreateServices, $storeOrderCartInfoServices, $statusService) {
$order = $otherOrder = [];
- $statusData = $statusService->getColumn(['oid' => $id], '*');
+ $statusData = $statusService->selectList(['oid' => $id])->toArray();
//订单实际支付金额
$order_pay_price = bcsub((string)bcadd((string)$orderInfo['total_price'], (string)$orderInfo['pay_postage'], 2), (string)bcadd((string)$orderInfo['deduction_price'], (string)$orderInfo['coupon_price'], 2), 2);
//有改价
@@ -106,6 +106,7 @@ class StoreOrderSplitServices extends BaseServices
$allData = [];
foreach ($statusData as $data) {
$data['oid'] = $new_id;
+ $data['change_time'] = strtotime($data['change_time']);
$allData[] = $data;
}
if ($allData) {
From 39fbac772010f1e7ae4487f04f4d182cdcd78dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 11:13:31 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC?=
=?UTF-8?q?=E6=97=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E6=94=AF=E4=BB=98=E9=87=91?=
=?UTF-8?q?=E9=A2=9D=EF=BC=8C=E5=9C=A8=E6=94=AF=E4=BB=98=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E5=86=85=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/uni-app/pages/users/user_payment/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/template/uni-app/pages/users/user_payment/index.vue b/template/uni-app/pages/users/user_payment/index.vue
index 858b30a8a..4a1352829 100644
--- a/template/uni-app/pages/users/user_payment/index.vue
+++ b/template/uni-app/pages/users/user_payment/index.vue
@@ -522,7 +522,8 @@
}
},
})
- } else {
+ } else {
+ if(this.numberPic == '') this.numberPic = this.money;
this.pay()
}
}
From 132005ee2e374b2db5af56d6bc6f4155f771f2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 11:34:35 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8E=E5=95=86?=
=?UTF-8?q?=E5=93=81=E7=82=B9=E5=87=BB=E5=AE=A2=E6=9C=8D=E4=B9=8B=E5=90=8E?=
=?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA=E5=95=86=E5=93=81=E5=8F=91?=
=?UTF-8?q?=E5=B8=83=E6=97=B6=E5=80=99=E7=9A=84=E5=95=86=E5=93=81=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/uni-app/pages/extension/customer_list/chat.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue
index 96da60d0d..e20f893d3 100644
--- a/template/uni-app/pages/extension/customer_list/chat.vue
+++ b/template/uni-app/pages/extension/customer_list/chat.vue
@@ -921,13 +921,14 @@
font-size: 28rpx;
color: #333333;
height: 85rpx;
- font-weight: 800;
+ font-weight: 800;
+ line-height: 40rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
- text-align: left !important;
+ text-align: left !important;
}
.broadcast_details_pic {
From 3e881944f57fac1c956fd5199fa31454fe7afb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 12:15:02 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=B5=B7=E6=8A=A5?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/uni-app/pages/activity/poster-poster/index.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/template/uni-app/pages/activity/poster-poster/index.vue b/template/uni-app/pages/activity/poster-poster/index.vue
index 16a30d9b4..3aa402fc3 100644
--- a/template/uni-app/pages/activity/poster-poster/index.vue
+++ b/template/uni-app/pages/activity/poster-poster/index.vue
@@ -168,7 +168,8 @@
let userData = await getUserInfo()
this.uid = userData.data.uid
let goods_img, mp_code, resData, arr, mpUrl
- // #ifdef MP
+ // #ifdef MP
+
// #endif
uni.showLoading({
title: that.$t(`海报生成中`),
@@ -198,7 +199,8 @@
let imgData = await this.imgToBase(resData.image, resData.url)
arr = [this.posterBag, imgData.image, imgData.code || this.codeSrc]
// #endif
- // #ifdef MP
+ // #ifdef MP
+ resData.image = that.setDomain(resData.image);
mpUrl = resData.url ? await this.downloadFilestoreImage(resData.url) : await this
.downloadFilestoreImage(this.mpUrl)
arr = [this.posterBag, await this.downloadFilestoreImage(resData.image), mpUrl]
@@ -235,7 +237,7 @@
})
},
//替换安全域名
- setDomain: function(image, url) {
+ setDomain: function(url) {
url = url ? url.toString() : '';
//本地调试打开,生产请注销
if (url.indexOf('https://') > -1) return url;
From 579e520aa3a269717b08ff74b6603fb453316893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 12:21:51 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
=?UTF-8?q?=E5=BC=BA=E8=BD=ACstring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/vendor/topthink/framework/src/think/cache/driver/File.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/vendor/topthink/framework/src/think/cache/driver/File.php b/crmeb/vendor/topthink/framework/src/think/cache/driver/File.php
index f0122f538..e648c2024 100644
--- a/crmeb/vendor/topthink/framework/src/think/cache/driver/File.php
+++ b/crmeb/vendor/topthink/framework/src/think/cache/driver/File.php
@@ -108,7 +108,7 @@ class File extends Driver
$content = gzuncompress($content);
}
- return ['content' => $content, 'expire' => $expire];
+ return ['content' => (string)$content, 'expire' => $expire];
}
}
From 9f35ac237b78251aee9d8cf6b663beffab98dd95 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Wed, 22 Feb 2023 14:57:00 +0800
Subject: [PATCH 19/29] =?UTF-8?q?improve:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom-bread-crumb.less | 1 +
.../components/header-bar/header-bar.less | 1 +
.../main/components/header-bar/header-bar.vue | 7 +-
.../sider-trigger/sider-trigger.less | 2 +-
.../sider-trigger/sider-trigger.vue | 2 +-
.../main/components/header-notice/index.vue | 2 +-
.../components/side-menu/collapsed-menu.vue | 22 +-
.../components/side-menu/side-menu-item.vue | 4 +-
.../main/components/side-menu/side-menu.less | 16 +-
.../main/components/side-menu/side-menu.vue | 317 +++++++++++++++---
template/admin/src/components/main/main.less | 9 +-
template/admin/src/components/main/main.vue | 84 ++---
template/admin/src/index.less | 2 +-
template/admin/src/store/module/menus.js | 4 +
template/admin/src/styles/style.css | 2 +-
15 files changed, 359 insertions(+), 116 deletions(-)
diff --git a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less
index 76102a988..80c504bf5 100644
--- a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less
+++ b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less
@@ -1,4 +1,5 @@
.custom-bread-crumb {
display: inline-block;
vertical-align: top;
+ color: #fff;
}
diff --git a/template/admin/src/components/main/components/header-bar/header-bar.less b/template/admin/src/components/main/components/header-bar/header-bar.less
index 89c72e0c9..4997ed025 100644
--- a/template/admin/src/components/main/components/header-bar/header-bar.less
+++ b/template/admin/src/components/main/components/header-bar/header-bar.less
@@ -2,6 +2,7 @@
width: 100%;
height: 100%;
position: relative;
+ color: #fff !important;
.custom-content-con {
float: right;
height: auto;
diff --git a/template/admin/src/components/main/components/header-bar/header-bar.vue b/template/admin/src/components/main/components/header-bar/header-bar.vue
index 127129070..5d83c1d24 100644
--- a/template/admin/src/components/main/components/header-bar/header-bar.vue
+++ b/template/admin/src/components/main/components/header-bar/header-bar.vue
@@ -2,15 +2,15 @@