From 49383d9ab56f293dde9ea7199e79a4227da5c69c Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 14 Aug 2020 00:29:15 +0800
Subject: [PATCH] F

---
 app/Controller/NotifyController.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Controller/NotifyController.php b/app/Controller/NotifyController.php
index 9d7fa85..6f9a494 100644
--- a/app/Controller/NotifyController.php
+++ b/app/Controller/NotifyController.php
@@ -20,6 +20,7 @@ use Hyperf\DbConnection\Db;
 use Hyperf\Guzzle\CoroutineHandler;
 use Exception;
 use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpMessage\Stream\SwooleStream;
 use Symfony\Component\HttpFoundation\Request;
 
 class NotifyController extends BaseController
@@ -65,12 +66,10 @@ class NotifyController extends BaseController
 
         $app['request'] = new Request($get,$post,[],$cookie,$files,$server,$xml);
 
-        var_dump('inside');
         // 通知回调，进行业务处理
         $response = $app->handlePaidNotify(function ($message, $fail) use ($app) {
             Db::beginTransaction();
             try {
-                var_dump('message', $message);
                 // 支付失败或者通知失败
                 if (
                     empty($message)
@@ -93,7 +92,7 @@ class NotifyController extends BaseController
                         'type' => OrderMain::ORDER_TYPE_ONLINE
                     ])
                     ->first();
-                var_dump('$orderMain', $orderMain);
+
                 // 订单不存在
                 if (empty($orderMain)) {
                     $this->log->event(
@@ -166,31 +165,34 @@ class NotifyController extends BaseController
 
                 // 喇叭通知，兼容旧音响，MQTT+IOT
                 $res = $this->mqttSpeakerService->speakToStore($orderMain->id);
-                var_dump('speakToStore',$res);
                 $res = $this->deviceService->pubMsgToStoreByOrderMainId($orderMain->id);
-                var_dump('pubMsgToStoreByOrderMainId',$res);
 
                 // 公众号模板消息
                 // $res = $this->miniprogramService->sendTemMsgForOnlineOrder($orderMain->id);
-                // var_dump('sendTemMsgForOnlineOrder',$res);
 
                 // 打印订单，自动打印 TODO 后续优化调用逻辑
                 $res = $this->feiePrintService->feiePrint($orderMain->global_order_id);
-                var_dump('feiePrint',$res);
 
                 Db::commit();
                 return true;
 
             } catch (Exception $e) {
 
-                var_dump($e->getMessage());
+                $this->log->event(
+                    LogLabel::PAY_NOTIFY_WXMINI,
+                    ['exception_fail' => $e->getMessage()]
+                );
                 Db::rollBack();
                 $fail('Exception');
             }
 
         });
 
-        $response->send();
+        var_dump('reponse',$response->getContent());
+        return $this->response
+            ->withHeader('Content-Type', 'application/xml')
+            ->withStatus(200)
+            ->withBody(new SwooleStream($response->getContent()));
 
     }