mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-16 15:34:27 +08:00
parent 0d7497ebd3
commit 368815b4e0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/order/RetailOrderController.php
View File

@ -163,6 +163,7 @@ class RetailOrderController extends BaseApiController
Redis::send('send-code-pay', ['number'=>$order['number']]); Redis::send('send-code-pay', ['number'=>$order['number']]);
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
$result['create_time']=$order['create_time'];
return $this->success('', $result); return $this->success('', $result);
break; break;
default: default:
@ -238,7 +239,8 @@ class RetailOrderController extends BaseApiController
Redis::send('send-code-pay', ['number'=>$order['number']]); Redis::send('send-code-pay', ['number'=>$order['number']]);
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
return $this->success('支付成功',['order_id'=>$order['order_id']]); $result['create_time']=$order['create_time'];
return $this->success('', $result);
break; break;
default: default:
return $this->fail('支付方式错误'); return $this->fail('支付方式错误');

3
app/common/logic/PayNotifyLogic.php
View File

@ -107,7 +107,8 @@ class PayNotifyLogic extends BaseLogic
} }
if ($order->pay_type == 9) { if ($order->pay_type == 9) {
PushService::push('store_merchant_' . $order['merchant'], $order['merchant'], ['type'=>'cash_register','msg'=>'您有一笔订单已支付']); $extra['create_time']=$order['create_time'];
PushService::push('store_merchant_' . $order['merchant'], $order['merchant'], ['type'=>'cash_register','msg'=>'您有一笔订单已支付','data'=>$extra]);
} else { } else {
PushService::push('store_merchant_' . $order['merchant'], $order['merchant'], ['type'=>'store_merchant','msg'=>'您有一笔新的订单']); PushService::push('store_merchant_' . $order['merchant'], $order['merchant'], ['type'=>'store_merchant','msg'=>'您有一笔新的订单']);
} }

2
app/common/service/PushService.php
View File

@ -16,7 +16,7 @@ class PushService
public static function push($subscription, $uid, $content) public static function push($subscription, $uid, $content)
{ {
$api = new Api( $api = new Api(
'http://127.0.0.1:3232', getenv('PUSH_URL'),
config('plugin.webman.push.app.app_key'), config('plugin.webman.push.app.app_key'),
config('plugin.webman.push.app.app_secret') config('plugin.webman.push.app.app_secret')
); );