mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新推送

Browse Source
This commit is contained in:
yaooo 2023-08-16 17:19:30 +08:00
parent cf31a1f153
commit 3545b5887e
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/common/service/JgPush.php
View File

@ -25,7 +25,6 @@ class JgPush
public function send($type, $data)
{
Log::info("sms ============= sms");
switch ($type) {
case 'ADMIN_PAY_SUCCESS_CODE':
$groupOrder = app()->make(StoreGroupOrderRepository::class)->get($data['id']);
@ -37,12 +36,12 @@ class JgPush
if (empty($jgRegisterId)) {
continue;
}
$msg = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? '您有新的订单已结算，请注意查看。' : '您有新的订单，请注意查看123123。';
$msg = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? '您有新的订单已结算，请注意查看。' : '您有新的订单，请注意查看。';
$msgType = StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? 'ORDER_SETTLEMENT' : 'ORDER_CREATE';
$this->addRegistrationId($jgRegisterId);
$this->androidNotification($msg, ['extras' => ['route' => $route, 'x' => 'xx']]);
$this->iosNotification($msg, ['extras' => ['route' => $route, 'x' => 'xx']]);
$this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
$this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
$this->push->send();
Log::info("sms ============= 111");
}
}
break;
@ -73,7 +72,6 @@ class JgPush
$this->push->send();
break;
case 'ORDER_CREATE':
Log::info("sms ============= ORDER_CREATE");
$order = app()->make(StoreOrderRepository::class)->get($data['id']);
if ($order->pay_type != StoreGroupOrder::PAY_TYPE_CREDIT_BUY) {
break;
@ -82,19 +80,16 @@ class JgPush
$merUserId = Merchant::where('mer_id', $order['mer_id'])->value('uid');
$jgRegisterId = User::where('uid', $merUserId)->value('jg_register_id');
if (empty($jgRegisterId)) {
Log::info("ORDER_CREATE 1");
break;
}
Log::info("ORDER_CREATE ============= 您有新的订单111，请注意查看。");
$this->addRegistrationId($jgRegisterId);
$this->androidNotification('您有新的订单，请注意查看111。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
$this->iosNotification('您有新的订单，请注意查看111。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
$this->androidNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
$this->iosNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
$this->push->send();
break;
case 'ORDER_PAY_SUCCESS':
$order = app()->make(StoreOrderRepository::class)->get($data['id']);
if ($order->pay_type != StoreGroupOrder::PAY_TYPE_CREDIT_BUY) {
Log::info("ORDER_CREATE 2");
break;
}
$route = "/pages/admin/orderDetail/index?id={$order['order_id']}&mer_id={$order['mer_id']}";
@ -103,10 +98,9 @@ class JgPush
if (empty($jgRegisterId)) {
break;
}
Log::info("ORDER_PAY_SUCCESS ============= 您有新的订单222，请注意查看。");
$this->addRegistrationId($jgRegisterId);
$this->androidNotification('您有新的订单，请注意查看222。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
$this->iosNotification('您有新的订单，请注意查看222。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
$this->androidNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
$this->iosNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
$this->push->send();
break;
default:

1
crmeb/jobs/SendSmsJob.php
View File

@ -31,7 +31,6 @@ class SendSmsJob implements JobInterface
if (!$status) {
$job->delete();
}
Log::info('app推送数据：' . $status);
if ($status['notice_app'] == 1) {
try {
/** @var JgPush $client */