From 9c2f3d6a206c96ec19f833efe38cac1985bcc048 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 10 Mar 2023 17:39:54 +0800
Subject: [PATCH] 1

---
 app/Amqp/Consumer/AssignDoctorConsumer.php |  1 +
 app/Controller/CallBackController.php      |  2 +
 app/Controller/UserController.php          | 46 +++++++++++-----------
 app/Services/ImService.php                 |  1 +
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php
index abd8af0..32f407a 100644
--- a/app/Amqp/Consumer/AssignDoctorConsumer.php
+++ b/app/Amqp/Consumer/AssignDoctorConsumer.php
@@ -193,6 +193,7 @@ class AssignDoctorConsumer extends ConsumerMessage
             // 发送消息
             $ImService->sendTextMessage($user_doctor['user_id'],$order_inquiry['user_id'],"等待医生接诊",$order_inquiry['order_inquiry_id']);
 
+            Log::getInstance()->info("分配医生成功，发送系统问诊消息成功");
         }catch (\Exception $e) {
             // 验证失败
             Log::getInstance()->error("分配医生成功，发送系统问诊消息失败:" . $e->getMessage());
diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index c4b1b03..4257098 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -147,6 +147,8 @@ class CallBackController extends AbstractController
 
                     // 发送消息
                     $ImService->sendTextMessage($user_doctor['user_id'],$order_inquiry['user_id'],"等待医生接诊",$order_inquiry['order_inquiry_id']);
+
+                    Log::getInstance()->info("微信支付回调数据处理成功，发送系统问诊消息成功");
                 }
             }
         }catch (\Exception $e) {
diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php
index 96c4f61..5e25bf1 100644
--- a/app/Controller/UserController.php
+++ b/app/Controller/UserController.php
@@ -88,18 +88,18 @@ class UserController extends AbstractController
         $out_trade_no = $this->request->input('out_trade_no');
 //        $generator = $this->container->get(IdGeneratorInterface::class);
 //
-//        $WechatPay = new WechatPay(1);
-////
-//        // 获取预支付交易会话标识
-//        $total =  0.01 * 100;
-//        $prepay = $WechatPay->getJsapiPrepayId($out_trade_no,$total,"omgU35DlE-rxTAGgcBjOuc4xdcX8");
-//        if (empty($prepay)){
-//            return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
-//        }
+        $WechatPay = new WechatPay(1);
 //
-//        // 获取小程序支付配置
-//        $pay_config = $WechatPay->getAppletsPayConfig($prepay['prepay_id']);
-//        return $this->response->json($pay_config);
+        // 获取预支付交易会话标识
+        $total =  0.01 * 100;
+        $prepay = $WechatPay->getJsapiPrepayId($out_trade_no,$total,"omgU35DlE-rxTAGgcBjOuc4xdcX8");
+        if (empty($prepay)){
+            return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
+        }
+
+        // 获取小程序支付配置
+        $pay_config = $WechatPay->getAppletsPayConfig($prepay['prepay_id']);
+        return $this->response->json($pay_config);
 
         // 发起退款
 //        $WechatPay = new WechatPay(1);
@@ -180,18 +180,18 @@ class UserController extends AbstractController
 
 
         // 专家-公益，发送im消息
-        $ImService = new ImService();
-
-        // 获取订单医生数据
-        $params = array();
-        $params['doctor_id'] = "491925054779883520";
-        $user_doctor = UserDoctor::getOne($params);
-        if (empty($user_doctor)){
-            Log::getInstance()->info("医生数据错误");
-        }
-
-        // 发送消息
-        $ImService->sendTextMessage($user_doctor['user_id'],"491923510680424449","等待医生接诊",491937904055369728);
+//        $ImService = new ImService();
+//
+//        // 获取订单医生数据
+//        $params = array();
+//        $params['doctor_id'] = "491925054779883520";
+//        $user_doctor = UserDoctor::getOne($params);
+//        if (empty($user_doctor)){
+//            Log::getInstance()->info("医生数据错误");
+//        }
+//
+//        // 发送消息
+//        $ImService->sendTextMessage($user_doctor['user_id'],"491923510680424449","等待医生接诊",491937904055369728);
 
 
     }
diff --git a/app/Services/ImService.php b/app/Services/ImService.php
index ef54914..babee7f 100644
--- a/app/Services/ImService.php
+++ b/app/Services/ImService.php
@@ -192,6 +192,7 @@ class ImService extends BaseService
             $arg['From_Account'] = $from_user_id; // 发送方user_id 如系统发送，无需填写
         }
         $arg['To_Account'] = $to_user_id; // 接收方user_id
+        $arg['ForbidCallbackControl'] = ['ForbidBeforeSendMsgCallback'];
         $arg['SendMsgControl'] = ['NoUnread'];
 
         $arg['MsgBody'] = [