github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修改小程序订单 虚拟商品

Browse Source
This commit is contained in:
Gosowong 2023-05-19 15:29:08 +08:00
parent 51ef4da7de
commit cae0c0fafe
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/app/jobs/MiniOrderJob.php
View File

@ -15,10 +15,10 @@ class MiniOrderJob extends BaseJobs
/**
* @throws HttpException
*/
public function doJob($shippingOrder)
public function doJob(string $out_trade_no, int $logistics_type, array $shipping_list, string $payer_openid, int $delivery_mode = 1, bool $is_all_delivered = true)
{
try {
MiniOrderService::shippingByTradeNo($shippingOrder['out_trade_no'], $shippingOrder['logistics_type'], $shippingOrder['shipping_list'], $shippingOrder['payer_openid'], $shippingOrder['delivery_mode'] ?? 1, $shippingOrder['is_all_delivered'] ?? true);
MiniOrderService::shippingByTradeNo($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered);
} catch (HttpException $e) {
// 订单异常处理
throw new HttpException($e);

2
crmeb/app/listener/order/OrderShippingListener.php
View File

@ -95,7 +95,7 @@ class OrderShippingListener implements ListenerInterface
if (empty($payer_openid)) {
throw new AdminException('订单支付人异常');
}
MiniOrderJob::dispatch(compact($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered));
MiniOrderJob::dispatch(compact('out_trade_no', 'logistics_type', 'shipping_list', 'payer_openid', 'delivery_mode', 'is_all_delivered'));
}
}
}

2
crmeb/app/services/order/OtherOrderServices.php
View File

@ -346,6 +346,8 @@ class OtherOrderServices extends BaseServices
if ($spread_two && $spread_two_price > 0) $this->memberBrokerage($spread_two, $spread_two_price, 'get_two_member_brokerage', $orderInfo);
}
// 小程序订单服务
event('OrderShipping', ['member', $orderInfo, 3, '', '']);
return false !== $res;
}

5
crmeb/app/services/order/StoreOrderSuccessServices.php
View File

@ -100,6 +100,11 @@ class StoreOrderSuccessServices extends BaseServices
event('NoticeListener', [$orderInfo, 'admin_pay_success_code']);
// 推送订单
event('OutPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
// 小程序订单管理 (自提商品)
if ($orderInfo['shipping_type'] == 2) {
event('OrderShipping', ['product', $orderInfo, 4, '', '']);
}
$res = $res1 && $resPink;
return false !== $res;
}

7
crmeb/app/services/pay/PayNotifyServices.php
View File

@ -39,11 +39,6 @@ class PayNotifyServices
$orderInfo = $services->getOne(['order_id' => $order_id]);
if (!$orderInfo) return true;
if ($orderInfo->paid) return true;
// 小程序订单管理 (自提商品)
if ($orderInfo['shipping_type'] == 2) {
event('OrderShipping', ['product', $orderInfo]);
}
return $services->paySuccess($orderInfo->toArray(), $payType, ['trade_no' => $trade_no]);
} catch (\Exception $e) {
return false;
@ -80,8 +75,6 @@ class PayNotifyServices
$orderInfo = $services->getOne(['order_id' => $order_id]);
if (!$orderInfo) return true;
if ($orderInfo->paid) return true;
// 小程序订单服务
event('OrderShipping', ['member', $orderInfo]);
return $services->paySuccess($orderInfo->toArray(), $payType, ['trade_no' => $trade_no]);
} catch (\Exception $e) {
return false;

2
crmeb/app/services/user/UserRechargeServices.php
View File

@ -491,7 +491,7 @@ class UserRechargeServices extends BaseServices
$capitalFlowServices->setFlow($order, 'recharge');
// 小程序订单服务
event('OrderShipping', ['recharge', $order]);
event('OrderShipping', ['recharge', $order, 3, '', '']);
//提醒推送
event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
return true;