切换导航条
此项目
正在载入...
登录
朱振飞
/
wake
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
xwp
5 years ago
提交
53fa0176cafdf01a99e55e1c248bbd2593497bfa
1 个父辈
a2fc44ed
1 个管道 的构建
通过
耗费 8 秒
推送修改
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
17 行增加
和
11 行删除
application/api/controller/Course.php
application/config.php
application/socket/Events.php
application/api/controller/Course.php
查看文件 @
53fa017
...
...
@@ -567,10 +567,11 @@ class Course extends Api
'form_id'
=>
$k
[
'id'
],
'page'
=>
'pages/classReserve/classReserve'
,
'data'
=>
[
"thing1"
=>
[
"value"
=>
$courseStore
[
'course'
][
'name'
]],
"date2"
=>
[
"value"
=>
$k
[
'CourseStore'
][
'start'
]],
"thing2"
=>
[
"value"
=>
$courseStore
[
'course'
][
'name'
]],
"thing4"
=>
[
"value"
=>
$courseStore
[
'store'
][
'address'
]],
"date1"
=>
[
"value"
=>
$k
[
'CourseStore'
][
'start'
]],
"name3"
=>
[
"value"
=>
$k
[
'user'
][
'nickname'
]],
"thing
4
"
=>
[
"value"
=>
"课程预约成功"
],
"thing
5
"
=>
[
"value"
=>
"课程预约成功"
],
],
];
...
...
application/config.php
查看文件 @
53fa017
...
...
@@ -20,8 +20,10 @@ return [
'mch_key'
=>
'MmXiXHO16b89tNx75t3T8rHTYMQBbn19'
,
//'notify_url' => '127.0.0.1/wake/public/api/order/notify',
'notify_url'
=>
'https://wake.w.brotop.cn/api/order/notify'
,
'course_sign_tmp'
=>
'0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey'
,
'course_start_tmp'
=>
'0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey'
,
//'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
'course_sign_tmp'
=>
'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc'
,
//'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
'course_start_tmp'
=>
'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc'
,
'order_over_tmp'
=>
'586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8'
,
],
...
...
application/socket/Events.php
查看文件 @
53fa017
...
...
@@ -51,8 +51,10 @@ class Events
'mch_key'
=>
'MmXiXHO16b89tNx75t3T8rHTYMQBbn19'
,
//'notify_url' => '127.0.0.1/wake/public/api/order/notify',
'notify_url'
=>
'https://wake.w.brotop.cn/api/order/notify'
,
'course_sign_tmp'
=>
'0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey'
,
'course_start_tmp'
=>
'0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey'
,
//'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
'course_sign_tmp'
=>
'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc'
,
//'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
'course_start_tmp'
=>
'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc'
,
'order_over_tmp'
=>
'586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8'
,
];
...
...
@@ -111,7 +113,7 @@ class Events
}
$courseStore
=
new
\app\admin\model\CourseStore
();
$courseStore
=
$courseStore
->
where
([
'notify'
=>
false
,
'status'
=>
'confirmed'
,
'start'
=>
[
'<'
,
date
(
'Y-m-d H:i:s'
,
time
()
+
$time
)]
])
->
select
();
$courseStore
=
$courseStore
->
w
ith
([
'store'
,
'course'
])
->
w
here
([
'notify'
=>
false
,
'status'
=>
'confirmed'
,
'start'
=>
[
'<'
,
date
(
'Y-m-d H:i:s'
,
time
()
+
$time
)]
])
->
select
();
$notice
=
new
\app\admin\model\UserNotice
();
foreach
(
$courseStore
as
$k
){
$courseStore
=
new
\app\admin\model\CourseStore
();
...
...
@@ -135,10 +137,11 @@ class Events
'form_id'
=>
$v
[
'id'
],
'page'
=>
'pages/classReserve/classReserve'
,
'data'
=>
[
"thing1"
=>
[
"value"
=>
$courseStore
[
'course'
][
'name'
]],
"date2"
=>
[
"value"
=>
$v
[
'CourseStore'
][
'start'
]],
"thing2"
=>
[
"value"
=>
$k
[
'course'
][
'name'
]],
"thing4"
=>
[
"value"
=>
$k
[
'store'
][
'address'
]],
"date1"
=>
[
"value"
=>
$v
[
'CourseStore'
][
'start'
]],
"name3"
=>
[
"value"
=>
$v
[
'user'
][
'nickname'
]],
"thing
4
"
=>
[
"value"
=>
"课程即将开始"
],
"thing
5
"
=>
[
"value"
=>
"课程即将开始"
],
],
];
...
...
请
注册
或
登录
后发表评论