朱振飞 / wake · 提交

转到一个项目

作者 xwp
提交 53fa0176cafdf01a99e55e1c248bbd2593497bfa 1 个父辈 a2fc44ed
1 个管道 的构建 通过 耗费 8 秒

推送修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 17 行增加 和 11 行删除
@@ -567,10 +567,11 @@ class Course extends Api @@ -567,10 +567,11 @@ class Course extends Api
567 'form_id'=>$k['id'], 567 'form_id'=>$k['id'],
568 'page'=>'pages/classReserve/classReserve', 568 'page'=>'pages/classReserve/classReserve',
569 'data'=>[ 569 'data'=>[
570 - "thing1" => ["value" => $courseStore['course']['name']],  
571 - "date2" => ["value" => $k['CourseStore']['start']], 570 + "thing2" => ["value" => $courseStore['course']['name']],
  571 + "thing4" => ["value" => $courseStore['store']['address']],
  572 + "date1" => ["value" => $k['CourseStore']['start']],
572 "name3" => ["value" => $k['user']['nickname']], 573 "name3" => ["value" => $k['user']['nickname']],
573 - "thing4" => ["value" => "课程预约成功"], 574 + "thing5" => ["value" => "课程预约成功"],
574 ], 575 ],
575 ]; 576 ];
576 577
@@ -20,8 +20,10 @@ return [ @@ -20,8 +20,10 @@ return [
20 'mch_key' => 'MmXiXHO16b89tNx75t3T8rHTYMQBbn19', 20 'mch_key' => 'MmXiXHO16b89tNx75t3T8rHTYMQBbn19',
21 //'notify_url' => '127.0.0.1/wake/public/api/order/notify', 21 //'notify_url' => '127.0.0.1/wake/public/api/order/notify',
22 'notify_url' => 'https://wake.w.brotop.cn/api/order/notify', 22 'notify_url' => 'https://wake.w.brotop.cn/api/order/notify',
23 - 'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',  
24 - 'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey', 23 + //'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
  24 + 'course_sign_tmp' => 'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc',
  25 + //'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
  26 + 'course_start_tmp' => 'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc',
25 'order_over_tmp' => '586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8', 27 'order_over_tmp' => '586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8',
26 ], 28 ],
27 29
@@ -51,8 +51,10 @@ class Events @@ -51,8 +51,10 @@ class Events
51 'mch_key' => 'MmXiXHO16b89tNx75t3T8rHTYMQBbn19', 51 'mch_key' => 'MmXiXHO16b89tNx75t3T8rHTYMQBbn19',
52 //'notify_url' => '127.0.0.1/wake/public/api/order/notify', 52 //'notify_url' => '127.0.0.1/wake/public/api/order/notify',
53 'notify_url' => 'https://wake.w.brotop.cn/api/order/notify', 53 'notify_url' => 'https://wake.w.brotop.cn/api/order/notify',
54 - 'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',  
55 - 'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey', 54 + //'course_sign_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
  55 + 'course_sign_tmp' => 'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc',
  56 + //'course_start_tmp' => '0A7sPV2VrDo7_3Fo5q9z-Ddh-m85_GvF15ANspbo70Ey',
  57 + 'course_start_tmp' => 'Y24N0zGcKj2tEFOh1elMoy5j5ppRK8MSGGINyaX5gYc',
56 'order_over_tmp' => '586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8', 58 'order_over_tmp' => '586FN0OLJ1DPZgwPwh7Ke2P4wewhm7l67awB77qrOi8',
57 ]; 59 ];
58 60
@@ -111,7 +113,7 @@ class Events @@ -111,7 +113,7 @@ class Events
111 } 113 }
112 114
113 $courseStore = new \app\admin\model\CourseStore(); 115 $courseStore = new \app\admin\model\CourseStore();
114 - $courseStore = $courseStore->where(['notify'=>false,'status'=>'confirmed','start' => ['<',date('Y-m-d H:i:s',time()+$time)] ])->select(); 116 + $courseStore = $courseStore->with(['store','course'])->where(['notify'=>false,'status'=>'confirmed','start' => ['<',date('Y-m-d H:i:s',time()+$time)] ])->select();
115 $notice = new \app\admin\model\UserNotice(); 117 $notice = new \app\admin\model\UserNotice();
116 foreach ($courseStore as $k){ 118 foreach ($courseStore as $k){
117 $courseStore = new \app\admin\model\CourseStore(); 119 $courseStore = new \app\admin\model\CourseStore();
@@ -135,10 +137,11 @@ class Events @@ -135,10 +137,11 @@ class Events
135 'form_id'=> $v['id'], 137 'form_id'=> $v['id'],
136 'page'=>'pages/classReserve/classReserve', 138 'page'=>'pages/classReserve/classReserve',
137 'data'=>[ 139 'data'=>[
138 - "thing1" => ["value" => $courseStore['course']['name']],  
139 - "date2" => ["value" => $v['CourseStore']['start']], 140 + "thing2" => ["value" => $k['course']['name']],
  141 + "thing4" => ["value" => $k['store']['address']],
  142 + "date1" => ["value" => $v['CourseStore']['start']],
140 "name3" => ["value" => $v['user']['nickname']], 143 "name3" => ["value" => $v['user']['nickname']],
141 - "thing4" => ["value" => "课程即将开始"], 144 + "thing5" => ["value" => "课程即将开始"],
142 ], 145 ],
143 ]; 146 ];
144 147