소스 검색

fix: 小程序订单 修改参数 添加跳转路径 添加收货处理

Gosowong 2 년 전
부모
커밋
06a563c1dd

+ 13 - 16
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;
             };
         });
     }

+ 2 - 0
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)
     {

+ 3 - 4
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'] ?? '',

+ 3 - 0
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);
     }