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..3eb62ae 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);
@@ -723,10 +723,6 @@ class Order extends Base
         exit;
     }
 
-
-    /**
-     * 发货订单导出
-     */
     /**
      * 发货订单导出
      */
@@ -796,7 +792,8 @@ class Order extends Base
             $user_info = 'ID：' . $value['user_id'] . " UID：" . ($value['user_info']['uid'] ?? $value['user_id']) . " 昵称：" . $value['user_info']['nickname'] . " 手机号：" . $value['user_info']['mobile'];
             $addtime = date('Y-m-d H:i:s', $value['addtime']);
 
-            $goods = OrderList::where('send_num', $value['send_num'])
+            $goods = OrderList::field('*,count(`id`) as num')
+                ->where('send_num', $value['send_num'])
                 ->append(['shang_title', 'card_no'])
                 ->group('prize_code')
                 ->order('id desc')
diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php
index 5d53f3a..fddc515 100755
--- a/app/admin/controller/Statistics.php
+++ b/app/admin/controller/Statistics.php
@@ -679,7 +679,9 @@ class Statistics extends Base
         }
 
         // 获取测试用户ID
-        $testUsers = User::where('istest', '>', 0)->column('id');
+        $testUsers = User::where('istest', '>', 0)
+        ->whereOr('status', '=', 2)
+        ->column('id');
         $testUserIds = empty($testUsers) ? [0] : $testUsers;
 
         // 获取盒子基本信息
@@ -841,7 +843,7 @@ class Statistics extends Base
         }
 
         // 获取测试用户ID
-        $testUsers = User::where('istest', '>', 0)->column('id');
+        $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
         $testUserIds = empty($testUsers) ? [0] : $testUsers;
 
         // 查询1：获取充值金额和余额消费总和
@@ -958,7 +960,7 @@ class Statistics extends Base
         }
 
         // 获取测试用户ID
-        $testUsers = User::where('istest', '>', 0)->column('id');
+        $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
         $testUserIds = empty($testUsers) ? [0] : $testUsers;
         
         // 获取盒子类型名称映射
@@ -1276,7 +1278,7 @@ class Statistics extends Base
         }
 
         // 获取测试用户ID
-        $testUsers = User::where('istest', '>', 0)->column('id');
+        $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
         $testUserIds = empty($testUsers) ? [0] : $testUsers;
 
         // 查询1：获取充值金额和余额消费总和
diff --git a/app/admin/view/User/user_box.html b/app/admin/view/User/user_box.html
index fc98484..6193504 100755
--- a/app/admin/view/User/user_box.html
+++ b/app/admin/view/User/user_box.html
@@ -12,7 +12,7 @@
                             <select name="status" lay-filter="status">
                                 <option value="">全部状态</option>
                                 <option value="0">盒柜中</option>
-                                <option value="1">已回收</option>
+                                <option value="1">兑换达达卷</option>
                                 <option value="2">选择发货</option>
                             </select>
                         </div>
@@ -121,7 +121,7 @@
                             var statusText = '';
                             switch (parseInt(d.status)) {
                                 case 0: statusText = '<span class="layui-badge layui-bg-blue">盒柜中</span>'; break;
-                                case 1: statusText = '<span class="layui-badge layui-bg-orange">已回收</span>'; break;
+                                case 1: statusText = '<span class="layui-badge layui-bg-orange">兑换达达卷</span>'; break;
                                 case 2: statusText = '<span class="layui-badge layui-bg-green">选择发货</span>'; break;
                                 default: statusText = '<span class="layui-badge layui-bg-gray">未知</span>';
                             }
diff --git a/app/api/route/app.php b/app/api/route/app.php
index ecbcf95..0e69e05 100755
--- a/app/api/route/app.php
+++ b/app/api/route/app.php
@@ -138,10 +138,10 @@ Route::any('warehouse_order_logistics', 'Warehouse/warehouse_order_logistics');
 #============================
 #Notify.php通知回调
 #============================
-Route::any('notify/order_notify', 'Notify/order_notify');
-Route::any('notify/ceshi', 'Notify/ceshi');
-Route::any('notify/order_notify7', 'Notify/order_notify7');
-Route::any('ad_notify', 'Notify/ad_notify');
+// Route::any('notify/order_notify', 'Notify/order_notify');
+// Route::any('notify/ceshi', 'Notify/ceshi');
+// Route::any('notify/order_notify7', 'Notify/order_notify7');
+// Route::any('ad_notify', 'Notify/ad_notify');
 Route::any('user_sign_list', 'User/user_sign_list');
 Route::any('user_sign', 'User/user_sign');
 Route::any('shop_seckill_index', 'Seckill/shop_seckill_index');