From 06a563c1ddc1d8af428ca682a2432b22f3355dc3 Mon Sep 17 00:00:00 2001 From: Gosowong <1329847115@qq.com> Date: Tue, 16 May 2023 18:15:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=B7=B3=E8=BD=AC=E8=B7=AF=E5=BE=84=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=94=B6=E8=B4=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmeb/services/app/MiniProgramService.php | 29 +++++++++---------- .../easywechat/orderShipping/BaseOrder.php | 2 ++ .../orderShipping/MiniOrderService.php | 7 ++--- .../easywechat/orderShipping/OrderClient.php | 3 ++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/crmeb/crmeb/services/app/MiniProgramService.php b/crmeb/crmeb/services/app/MiniProgramService.php index eb3c14c18..620eacf9d 100644 --- a/crmeb/crmeb/services/app/MiniProgramService.php +++ b/crmeb/crmeb/services/app/MiniProgramService.php @@ -11,6 +11,7 @@ namespace crmeb\services\app; +use app\services\order\StoreOrderTakeServices; use crmeb\exceptions\AdminException; use crmeb\services\SystemConfigService; use app\services\pay\PayNotifyServices; @@ -108,7 +109,7 @@ class MiniProgramService 'log' => [ 'level' => 'debug', 'permission' => 0777, - 'file' => '/www/wwwroot/bz.wuht.net/crmeb/crmeb/runtime/log', + 'file' => '/www/wwwroot/bz.wuht.net/crmeb/crmeb/runtime/log/easywechat.log', ], ]; $config['mini_program'] = [ @@ -880,26 +881,22 @@ class MiniProgramService switch ($message->MsgType) { case 'event': switch (strtolower($message->Event)) { - case 'trade_manage_remind_access_api': - Log::error('event1'); + case 'trade_manage_remind_access_api': // 小程序完成账期授权时 小程序产生第一笔交易时 已产生交易但从未发货的小程序，每天一次 break; - case 'trade_manage_remind_shipping': - Log::error('event2'); + case 'trade_manage_remind_shipping': // 曾经发过货的小程序，订单超过48小时未发货时 break; - case 'trade_manage_order_settlement': - Log::error('event3'); + case 'trade_manage_order_settlement': // 订单完成发货时 订单结算时 + if (isset($message['estimated_settlement_time'])) { //订单完成发货时 + + } + if (isset($message['confirm_receive_method'])) { // 订单结算时 + /** @var StoreOrderTakeServices $StoreOrderTakeServices */ + $storeOrderTakeServices = app()->make(StoreOrderTakeServices::class); + $storeOrderTakeServices->takeOrder($message['merchant_trade_no'], 0); + } break; }; break; - case 'trade_manage_remind_access_api': - Log::error('notevent1'); - break; - case 'trade_manage_remind_shipping': - Log::error('notevent2'); - break; - case 'trade_manage_order_settlement': - Log::error('notevent3'); - break; }; }); } diff --git a/crmeb/crmeb/services/easywechat/orderShipping/BaseOrder.php b/crmeb/crmeb/services/easywechat/orderShipping/BaseOrder.php index 599c22d13..8d7100e5f 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/BaseOrder.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/BaseOrder.php @@ -19,6 +19,8 @@ class BaseOrder extends AbstractAPI const ORDER = 'wxa/sec/order/'; const EXPRESS = 'cgi-bin/express/delivery/open_msg/'; + const PATH = '/pages/goods/order_details/index'; + public function __construct(AccessToken $accessToken, $config) { diff --git a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php index 7e5bed349..5541b27a6 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php @@ -8,7 +8,6 @@ use EasyWeChat\Core\Exceptions\HttpException; class MiniOrderService { - /** * @var Application */ @@ -25,11 +24,11 @@ class MiniOrderService { $payment = SystemConfigService::more(['routine_appId', 'routine_appsecret', 'pay_weixin_mchid', 'pay_new_weixin_open', 'pay_new_weixin_mchid']); return [ - 'debug' => true, + 'debug' => true, 'log' => [ - 'level' => 'debug', + 'level' => 'debug', 'permission' => 0777, - 'file' => '/www/wwwroot/bz.wuht.net/crmeb/crmeb/runtime/log', + 'file' => '/www/wwwroot/bz.wuht.net/crmeb/crmeb/runtime/log/easywechat.log', ], 'mini_program' => [ 'app_id' => $payment['routine_appId'] ?? '', diff --git a/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php b/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php index 774da617d..c3dee6f57 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php @@ -103,6 +103,9 @@ class OrderClient extends BaseOrder 'contact' => $contact ]; } + + // 跳转路径 + $this->setMesJumpPath(self::PATH . '?order_id=' . $out_trade_no); return $this->shipping($params); }