订单导出bugfix

frontendApi/modules/v1/controllers/ShopController.php

@@ -487,7 +487,7 @@ class ShopController extends BaseController {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
         $orderSn = \Yii::$app->request->get('orderSn');
 
-        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
+        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN AND O.IS_DELETE = 0";
         $params = [
             ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
@@ -503,6 +503,9 @@ class ShopController extends BaseController {
             ],
         ]);
         if (!$data['list']) {
+            $condition .= ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)';
+            $params[':NOT_PAID'] = \Yii::$app->params['orderStatus']['notPaid']['value'];   // 待支付
+            $params[':FAIL_PAID'] = \Yii::$app->params['orderStatus']['failPaid']['value'];   // 支付失败
             $data = ApproachOrder::lists($condition, $params, [
                 'select' => 'O.*,U.REAL_NAME,OG.*,OG.CATEGORY_TYPE',
                 'orderBy' => 'O.CREATED_AT DESC',