From 51ef4da7de2e4ff2cb84898a35086ebd84ce7d6d Mon Sep 17 00:00:00 2001 From: Gosowong <1329847115@qq.com> Date: Fri, 19 May 2023 14:10:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=AE=A2=E5=8D=95=E4=B8=BA=E9=98=9F=E5=88=97=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=85=85=E5=80=BC=20=E4=BC=9A=E5=91=98=20?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/jobs/MiniOrderJob.php | 27 ++++ .../listener/order/OrderShippingListener.php | 120 +++++++++++------- .../order/StoreOrderDeliveryServices.php | 3 +- .../services/order/StoreOrderTakeServices.php | 2 +- crmeb/app/services/pay/PayNotifyServices.php | 7 + .../services/user/UserRechargeServices.php | 2 + .../crmeb/services/app/MiniProgramService.php | 3 +- 7 files changed, 114 insertions(+), 50 deletions(-) create mode 100644 crmeb/app/jobs/MiniOrderJob.php diff --git a/crmeb/app/jobs/MiniOrderJob.php b/crmeb/app/jobs/MiniOrderJob.php new file mode 100644 index 000000000..c9236b71d --- /dev/null +++ b/crmeb/app/jobs/MiniOrderJob.php @@ -0,0 +1,27 @@ + 0) { - $delivery_mode = 2; - // 判断订单是否全部发货 - /** @var StoreOrderServices $orderServices */ - $orderServices = app()->make(StoreOrderServices::class); - $is_all_delivered = $orderServices->checkSubOrderNotSend((int)$order['pid'], (int)$order['id']); - $p_order = $orderServices->get((int)$order['pid']); - if (!$p_order) { - throw new AdminException('拆单异常'); - } - $out_trade_no = $p_order['order_id']; - } + //判断订单是否拆单 + $delivery_mode = 1; + $is_all_delivered = true; + if ($order_type == 'product') { // 商品订单 + if ($order['is_channel'] == 1 && $order['pay_type'] == 'weixin') { + $out_trade_no = $order['order_id']; + /** @var StoreOrderCartInfoServices $orderInfoServices */ + $orderInfoServices = app()->make(StoreOrderCartInfoServices::class); + $item_desc = $orderInfoServices->getCarIdByProductTitle((int)$order['id'], true); - // 整理商品信息 - /** @var StoreOrderCartInfoServices $orderInfoServices */ - $orderInfoServices = app()->make(StoreOrderCartInfoServices::class); - $item_desc = $orderInfoServices->getCarIdByProductTitle((int)$order['id'], true); - $shipping_list = [ - ['item_desc' => $item_desc] - ]; - //判断订单物流模式 - if ($order['shipping_type'] == 1) { - if ($delivery_type == 1) { - $shipping_list = [ - [ - 'tracking_no' => $delivery_id ?? '', - 'express_company' => $delivery_name ?? '', - 'item_desc' => $item_desc, - 'contact' => [ - 'receiver_contact' => $order['user_phone'] - ] - ] - ]; + if ($order['pid'] > 0) { + $delivery_mode = 2; + // 判断订单是否全部发货 + /** @var StoreOrderServices $orderServices */ + $orderServices = app()->make(StoreOrderServices::class); + $is_all_delivered = $orderServices->checkSubOrderNotSend((int)$order['pid'], (int)$order['id']); + $p_order = $orderServices->get((int)$order['pid']); + if (!$p_order) { + throw new AdminException('拆单异常'); + } + $out_trade_no = $p_order['order_id']; } - $logistics_type = $delivery_type; + $pay_uid = $order['pay_uid']; } else { - $logistics_type = 4; + return; } - //查找支付者openid - /** @var WechatUserServices $wechatUserService */ - $wechatUserService = app()->make(WechatUserServices::class); - $payer_openid = $wechatUserService->uidToOpenid($order['pay_uid'], 'routine'); - if (empty($payer_openid)) { - throw new AdminException('订单支付人异常'); + } else if ($order_type == 'recharge') { // 充值订单 + if ($order['recharge_type'] == 'routine' && $order['paid'] == 1) { + $delivery_type = 3; + $item_desc = '用户充值' . $order['price']; + $out_trade_no = $order['order_id']; + $pay_uid = $order['uid']; + } else { + return; } - MiniOrderService::shippingByTradeNo($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered); + } else if ($order_type == 'member') { // 会员订单 + if ($order['pay_type'] == 'weixin') { + $delivery_type = 3; + $item_desc = '用户购买' . $order['member_type'] . '会员卡'; + $out_trade_no = $order['order_id']; + $pay_uid = $order['uid']; + } else { + return; + } + } else { + return; } + // 整理商品信息 + $shipping_list = [ + ['item_desc' => $item_desc] + ]; + //判断订单物流模式 + if ($order['shipping_type'] == 1) { + if ($delivery_type == 1) { + $shipping_list = [ + [ + 'tracking_no' => $delivery_id ?? '', + 'express_company' => $delivery_name ?? '', + 'item_desc' => $item_desc, + 'contact' => [ + 'receiver_contact' => $order['user_phone'] + ] + ] + ]; + } + $logistics_type = $delivery_type; + } else { + $logistics_type = 4; + } + //查找支付者openid + /** @var WechatUserServices $wechatUserService */ + $wechatUserService = app()->make(WechatUserServices::class); + $payer_openid = $wechatUserService->uidToOpenid($pay_uid, 'routine'); + if (empty($payer_openid)) { + throw new AdminException('订单支付人异常'); + } + MiniOrderJob::dispatch(compact($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered)); } } } diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index e7519c69a..f3ee7d921 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -463,7 +463,8 @@ class StoreOrderDeliveryServices extends BaseServices if (!$data['delivery_id']) { $data['delivery_id'] = uniqid(); } - event('OrderShipping', [$orderInfo, $type, $data['delivery_id'], $data['delivery_name']]); + // 小程序订单管理 + event('OrderShipping', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_name']]); //到期自动收货 event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]); return $res; diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php index 022f8a6d2..228220a7e 100644 --- a/crmeb/app/services/order/StoreOrderTakeServices.php +++ b/crmeb/app/services/order/StoreOrderTakeServices.php @@ -58,7 +58,7 @@ class StoreOrderTakeServices extends BaseServices //查找订单信息 $order = $this->dao->getOne(['order_id' => $merchant_trade_no]); if (!$order) { - throw new ApiException(410173); + return true; } if ($order['pid'] == -1) { // 有子订单 // 查找待收货的子订单 diff --git a/crmeb/app/services/pay/PayNotifyServices.php b/crmeb/app/services/pay/PayNotifyServices.php index b160463cb..50d429b3b 100644 --- a/crmeb/app/services/pay/PayNotifyServices.php +++ b/crmeb/app/services/pay/PayNotifyServices.php @@ -39,6 +39,11 @@ 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; @@ -75,6 +80,8 @@ 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; diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php index 9083d5a1d..cb7614c6d 100644 --- a/crmeb/app/services/user/UserRechargeServices.php +++ b/crmeb/app/services/user/UserRechargeServices.php @@ -490,6 +490,8 @@ class UserRechargeServices extends BaseServices $order['phone'] = $user['phone']; $capitalFlowServices->setFlow($order, 'recharge'); + // 小程序订单服务 + event('OrderShipping', ['recharge', $order]); //提醒推送 event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']); return true; diff --git a/crmeb/crmeb/services/app/MiniProgramService.php b/crmeb/crmeb/services/app/MiniProgramService.php index 1955ad0c3..cb7e7c775 100644 --- a/crmeb/crmeb/services/app/MiniProgramService.php +++ b/crmeb/crmeb/services/app/MiniProgramService.php @@ -13,6 +13,7 @@ namespace crmeb\services\app; use app\services\order\StoreOrderTakeServices; use crmeb\exceptions\AdminException; +use crmeb\services\easywechat\orderShipping\MiniOrderService; use crmeb\services\SystemConfigService; use app\services\pay\PayNotifyServices; use crmeb\services\easywechat\Application; @@ -887,7 +888,7 @@ class MiniProgramService break; case 'trade_manage_order_settlement': // 订单完成发货时 订单结算时 if (isset($message['estimated_settlement_time'])) { //订单完成发货时 - + MiniOrderService::notifyConfirmByTradeNo($message['merchant_trade_no'], time()); } if (isset($message['confirm_receive_method'])) { // 订单结算时 /** @var StoreOrderTakeServices $StoreOrderTakeServices */