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

Merge branch 'feature/push' into dev

Browse Source
This commit is contained in:
luofei 2023-07-01 15:06:18 +08:00
commit 7c759fdaf6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ class JgPush
{ {
switch ($type) { switch ($type) {
case 'ADMIN_PAY_SUCCESS_CODE': case 'ADMIN_PAY_SUCCESS_CODE':
$groupOrder = app()->make(StoreGroupOrderRepository::class)->get($data['group_order_id']); $groupOrder = app()->make(StoreGroupOrderRepository::class)->get($data['id']);
if ($groupOrder) { if ($groupOrder) {
foreach ($groupOrder->orderList as $order) { foreach ($groupOrder->orderList as $order) {
$route = "/pages/admin/orderDetail/index?id={$order['order_id']}&mer_id={$order['mer_id']}"; $route = "/pages/admin/orderDetail/index?id={$order['order_id']}&mer_id={$order['mer_id']}";
@ -41,7 +41,7 @@ class JgPush
break; break;
case 'DELIVER_GOODS_CODE': case 'DELIVER_GOODS_CODE':
case 'ORDER_DELIVER_SUCCESS': case 'ORDER_DELIVER_SUCCESS':
$order = app()->make(StoreOrderRepository::class)->get($data['order_id']); $order = app()->make(StoreOrderRepository::class)->get($data['id']);
if ($order) { if ($order) {
$route = "/pages/order_details/index?order_id={$order['order_id']}"; $route = "/pages/order_details/index?order_id={$order['order_id']}";
$jgRegisterId = User::where('uid', $order['uid'])->value('jg_register_id'); $jgRegisterId = User::where('uid', $order['uid'])->value('jg_register_id');

2
app/listener/paySuccessOrder.php
View File

@ -123,7 +123,7 @@ class paySuccessOrder
]; ];
} }
if (!$financialRecordRepository->insertAll($this->finance)) { if ($financialRecordRepository->insertAll($this->finance) === false) {
throw new \Exception('财务流水保存出错'); throw new \Exception('财务流水保存出错');
} }
Db::commit(); Db::commit();