|
|
@@ -83,14 +83,14 @@ class Order extends ApiController
|
|
|
->select();
|
|
|
|
|
|
|
|
|
- $order = isset($lists[0])? $lists[0] : [];
|
|
|
- $lastOrderTime = isset($order['created_at'])? $order['created_at']['val'] : time();
|
|
|
- $hasNewOrder = $order && $lastOrderTime != $taxiUser->last_order_time? true : false;
|
|
|
- $taxiUser->last_order_time = $hasNewOrder? $lastOrderTime : $taxiUser->last_order_time;
|
|
|
+ $order = isset($lists[0]) ? $lists[0] : [];
|
|
|
+ $lastOrderTime = isset($order['created_at']) ? $order['created_at']['val'] : time();
|
|
|
+ $hasNewOrder = $order && $lastOrderTime != $taxiUser->last_order_time ? true : false;
|
|
|
+ $taxiUser->last_order_time = $hasNewOrder ? $lastOrderTime : $taxiUser->last_order_time;
|
|
|
$taxiUser->save();
|
|
|
|
|
|
$count = $lists->count();
|
|
|
- return IResponse::success(['list' => $lists, 'total' => $count, 'hasNewOrder'=> $hasNewOrder], '获取成功');
|
|
|
+ return IResponse::success(['list' => $lists, 'total' => $count, 'hasNewOrder' => $hasNewOrder], '获取成功');
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -201,7 +201,7 @@ class Order extends ApiController
|
|
|
return IResponse::failure('接单失败');
|
|
|
}
|
|
|
|
|
|
- push_socket_data('motor',[
|
|
|
+ push_socket_data('motor', [
|
|
|
'id' => $info['id'],
|
|
|
'msg' => '有新的摩的订单等待处理,点击前往!'
|
|
|
]);
|
|
|
@@ -209,49 +209,55 @@ class Order extends ApiController
|
|
|
Db::commit();
|
|
|
|
|
|
// 模板消息
|
|
|
- $tplTitle = "人人接 - 摩的服务";
|
|
|
- $thing7 = '电话请保持通畅,师傅正在赶往路上,请稍候';
|
|
|
- $user = model('common/Users')->where(['id'=> $info['user_id']])->find();
|
|
|
- if($user && $user['open_id']){
|
|
|
- $this->tpl1['touser'] = $user['open_id'];
|
|
|
- $this->tpl1['data'] = [
|
|
|
- 'character_string1' => [
|
|
|
- 'value' => $info['order_no'],
|
|
|
- ],
|
|
|
- 'thing3' => [
|
|
|
- 'value' => $tplTitle,
|
|
|
- ],
|
|
|
- 'amount4' => [
|
|
|
- 'value' => $info['price'],
|
|
|
- ],
|
|
|
- 'date2' => [
|
|
|
- 'value' => date("Y/m/d H:i:s"),
|
|
|
- ],
|
|
|
- 'thing7' => [
|
|
|
- 'value' => $thing7,
|
|
|
- ]
|
|
|
- ];
|
|
|
+ try {
|
|
|
+ $tplTitle = "人人接 - 摩的服务";
|
|
|
+ $thing7 = '电话请保持通畅,师傅正在赶往路上,请稍候';
|
|
|
+ $user = model('common/Users')->where(['id' => $info['user_id']])->find();
|
|
|
+ if ($user && $user['open_id']) {
|
|
|
+ $tpl1 = [
|
|
|
+ 'template_id' => 'bhkIzzwYpjjXJJ9lPdfXIsUYRrfSz52aJel1n74AA7A', // 所需下发的订阅模板id
|
|
|
+ 'touser' => 'o11PJ5QDWJnIa1kPKsvvStXj243U',
|
|
|
+ 'data' => [
|
|
|
+ ]
|
|
|
+ ];
|
|
|
+ $tpl1['touser'] = $user['open_id'];
|
|
|
+ $tpl1['data'] = [
|
|
|
+ 'character_string1' => [
|
|
|
+ 'value' => $info['order_no'],
|
|
|
+ ],
|
|
|
+ 'thing3' => [
|
|
|
+ 'value' => $tplTitle,
|
|
|
+ ],
|
|
|
+ 'amount4' => [
|
|
|
+ 'value' => $info['price'],
|
|
|
+ ],
|
|
|
+ 'date2' => [
|
|
|
+ 'value' => date("Y/m/d H:i:s"),
|
|
|
+ ],
|
|
|
+ 'thing7' => [
|
|
|
+ 'value' => $thing7,
|
|
|
+ ]
|
|
|
+ ];
|
|
|
+
|
|
|
+ // 模板消息
|
|
|
+ $wechat = sys_config('', 'wechat');
|
|
|
+ $config = [
|
|
|
+ 'app_id' => $wechat['mini_appid'],
|
|
|
+ 'secret' => $wechat['mni_secret_key'],
|
|
|
+ 'response_type' => 'array',
|
|
|
+ 'log' => [
|
|
|
+ 'level' => 'debug',
|
|
|
+ 'file' => app()->getRuntimePath() . 'log/' . date('Ym') . '/wechat_debug.log',
|
|
|
+ ],
|
|
|
+ ];
|
|
|
+ $wechat = Factory::miniProgram($config);
|
|
|
+
|
|
|
+ $wechat->subscribe_message->send($tpl1);
|
|
|
+ }
|
|
|
+ } catch (\Exception $exception) {
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- // 模板消息
|
|
|
- $wechat = sys_config('', 'wechat');
|
|
|
- $config = [
|
|
|
- 'app_id' => $wechat['mini_appid'],
|
|
|
- 'secret' => $wechat['mni_secret_key'],
|
|
|
- 'response_type' => 'array',
|
|
|
- 'log' => [
|
|
|
- 'level' => 'debug',
|
|
|
- 'file' => app()->getRuntimePath() . 'log/'.date('Ym').'/wechat_debug.log',
|
|
|
- ],
|
|
|
- ];
|
|
|
- $wechat = Factory::miniProgram($config);
|
|
|
- $tpl1 = [
|
|
|
- 'template_id' => 'bhkIzzwYpjjXJJ9lPdfXIsUYRrfSz52aJel1n74AA7A', // 所需下发的订阅模板id
|
|
|
- 'touser' => 'o11PJ5QDWJnIa1kPKsvvStXj243U',
|
|
|
- 'data' => [
|
|
|
- ]
|
|
|
- ];
|
|
|
- $wechat->subscribe_message->send($tpl1);
|
|
|
return IResponse::success('接单成功,请尽快前往客户所在地接驾');
|
|
|
}
|
|
|
|
|
|
@@ -269,7 +275,7 @@ class Order extends ApiController
|
|
|
return IResponse::failure('用户不存在,或已被冻结');
|
|
|
}
|
|
|
|
|
|
- if($taxiUser['user_id']<=0){
|
|
|
+ if ($taxiUser['user_id'] <= 0) {
|
|
|
return IResponse::failure('账户未绑定用户');
|
|
|
}
|
|
|
|
|
|
@@ -298,14 +304,14 @@ class Order extends ApiController
|
|
|
}
|
|
|
|
|
|
// 到账
|
|
|
- if($info['settle_price']){
|
|
|
- if(!model('common/Users')->changePartnership(
|
|
|
+ if ($info['settle_price']) {
|
|
|
+ if (!model('common/Users')->changePartnership(
|
|
|
$taxiUser['user_id'],
|
|
|
$info['settle_price'],
|
|
|
"订单完成,金额到账【" . $info['settle_price'] . "】",
|
|
|
30,
|
|
|
true
|
|
|
- )){
|
|
|
+ )) {
|
|
|
Db::rollback();
|
|
|
return IResponse::failure('确认失败');
|
|
|
}
|