From eb0fe44cbd0e44eec00874a22ce0688ae6ef76e5 Mon Sep 17 00:00:00 2001
From: Billy <641833868@qq.com>
Date: Tue, 21 Oct 2025 11:14:27 +0800
Subject: [PATCH] 1

---
 addons/shopro/controller/Pay.php         | 4 ++--
 addons/shopro/controller/order/Order.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/shopro/controller/Pay.php b/addons/shopro/controller/Pay.php
index b69bc38..c1cf25e 100755
--- a/addons/shopro/controller/Pay.php
+++ b/addons/shopro/controller/Pay.php
@@ -344,7 +344,7 @@ class Pay extends Common
      *
      * @param object|string $result
      * @param string|null $payment
-     * @return void
+     * @return object|string|\think\Response|null
      */
     private function payResponse($result = null, $payment = null)
     {
@@ -363,7 +363,7 @@ class Pay extends Common
      * 根据订单号获取订单实例
      *
      * @param [type] $order_sn
-     * @return void
+     * @return array
      */
     private function getOrderInstance($order_sn)
     {
diff --git a/addons/shopro/controller/order/Order.php b/addons/shopro/controller/order/Order.php
index a8501aa..1f278e0 100755
--- a/addons/shopro/controller/order/Order.php
+++ b/addons/shopro/controller/order/Order.php
@@ -77,7 +77,6 @@ class Order extends Common
             $this->error(__('No Results were found'));
         }
 
-        $order->pay_types_text = $order->pay_types_text;
         // 处理未支付订单 item status_code
         $order = $order->setOrderItemStatusByOrder($order);     // 这里订单转 数组了