From c1cdc780795bfb3cba9061cd30184bce09d9f620 Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Sat, 26 Apr 2025 15:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Finance.php |  2 +-
 app/admin/controller/Order.php   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php
index e2e05b7..6e59e76 100755
--- a/app/admin/controller/Finance.php
+++ b/app/admin/controller/Finance.php
@@ -26,7 +26,7 @@ class Finance extends Base
         $mobile = trim(input('get.mobile'));
         $addtime = trim(input('get.addtime'));
         $whe = [];
-        $whe[] = ['order_type', '<', 12];
+        // $whe[] = ['order_type', '<', 12];
         $whe[] = ['status', '=', 1];
         if ($user_id) {
             $user_id = $this->convertUidToUserId($user_id);
diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php
index 9b05976..a55db61 100755
--- a/app/admin/controller/Order.php
+++ b/app/admin/controller/Order.php
@@ -501,12 +501,12 @@ class Order extends Base
         if ($info['status'] == 4) {
             return $this->renderError('请勿重复操作');
         }
-        if ($info['status'] == 1) {
-            return $this->renderError('该订单未发货');
-        }
-        if ($info['status'] != 2) {
-            return $this->renderError('请求参数错误1');
-        }
+        // if ($info['status'] == 1) {
+        //     return $this->renderError('该订单未发货');
+        // }
+        // if ($info['status'] != 2) {
+        //     return $this->renderError('请求参数错误1');
+        // }
         if ($info['freight'] > 0) {
             $wxServer = new \app\common\server\WechatRefund($this->app);
             $refund_res = $wxServer->OrderRefund($info);