From 7bf0b4d44be5aacdf6a4874be986341325c1adb6 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 23 Apr 2024 16:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E9=97=AE?=
 =?UTF-8?q?=E8=AF=8A=E8=AE=A2=E5=8D=95=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php       | 9 +++------
 app/Services/OrderServicePackageService.php | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index f435af9..397d53e 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -2570,14 +2570,11 @@ class CallBackController extends AbstractController
             $data['user_id'] = $order_service_package['user_id'];
             $data['patient_id'] = $order_service_package['patient_id'];
             $data['doctor_id'] = $order_service_package['doctor_id'];
-            if ($order_service_package['order_service_type'] == 1){
-                $data['order_type'] = 5; // 订单类型（1:问诊订单 2:药品订单 3:检测订单 4:随访包订单 5:健康包订单）
-            }else{
-                $data['order_type'] = 4; // 订单类型（1:问诊订单 2:药品订单 3:检测订单 4:随访包订单 5:健康包订单）
-            }
+            $data['order_type'] = 1; // 订单类型（1:问诊订单 2:药品订单 3:检测订单 4:随访包订单 5:健康包订单）
             $data['inquiry_pay_channel'] = 3; // 支付渠道（1:小程序支付 2:微信扫码支付）
             $data['pay_status'] = 2; // 1:待支付
             $data['order_no'] = "I" . $generator->generate(); // 订单编号
+            $data['escrow_trade_no'] = "GD" . $generator->generate(); // 第三方支付流水号
             $data['amount_total'] = 0; // 订单金额
             $data['coupon_amount_total'] = 0; // 优惠卷总金额
             $data['payment_amount_total'] = 0; // 实际付款金额
@@ -2600,7 +2597,7 @@ class CallBackController extends AbstractController
             $data['inquiry_pay_channel'] = 3; // 支付渠道（1:小程序支付 2:微信扫码支付 3:模拟支付）
             $data['inquiry_pay_status'] = 2; // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
             $data['inquiry_no'] = $order['order_no'];// 订单编号
-            $data['escrow_trade_no'] = "GD" . $generator->generate(); // 第三方支付流水号
+            $data['escrow_trade_no'] = $order['escrow_trade_no']; // 第三方支付流水号
             $data['amount_total'] = 0;// 订单金额
             $data['coupon_amount_total'] = 0;// 优惠卷总金额
             $data['payment_amount_total'] = 0;// 实际付款金额
diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index 0db2cd5..05802b5 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -773,6 +773,7 @@ class OrderServicePackageService extends BaseService
             $data['inquiry_pay_channel'] = 3; // 支付渠道（1:小程序支付 2:微信扫码支付）
             $data['pay_status'] = 2; // 1:待支付
             $data['order_no'] = "I" . $generator->generate(); // 订单编号
+            $data['escrow_trade_no'] = "GD" . $generator->generate(); // 第三方支付流水号
             $data['amount_total'] = 0; // 订单金额
             $data['coupon_amount_total'] = 0; // 优惠卷总金额
             $data['payment_amount_total'] = 0; // 实际付款金额
@@ -794,7 +795,7 @@ class OrderServicePackageService extends BaseService
             $data['inquiry_pay_channel'] = 3; // 支付渠道（1:小程序支付 2:微信扫码支付 3:模拟支付）
             $data['inquiry_pay_status'] = 2; // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
             $data['inquiry_no'] = $order['order_no'];// 订单编号
-            $data['escrow_trade_no'] = "GD" . $generator->generate(); // 第三方支付流水号
+            $data['escrow_trade_no'] = $order['escrow_trade_no']; // 第三方支付流水号
             $data['amount_total'] = 0;// 订单金额
             $data['coupon_amount_total'] = 0;// 优惠卷总金额
             $data['payment_amount_total'] = 0;// 实际付款金额