下单

app-ghs/controllers/OrderController.php

@@ -243,12 +243,12 @@ class OrderController extends BaseController
         $id = isset($get['id']) ? $get['id'] : 0;
         $order = OrderClass::getById($id, true);
         if (empty($order)) {
-            util::complete('没有找到订单');
+            util::success(['returnStatus' => 'SUCCESS']);
+        }
+        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
+            util::complete('订单已付款');
         }
         if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
-                util::complete('订单已付款');
-            }
             util::complete('订单不是待付款状态');
         }
         OrderClass::valid($order, $this->shopId);
@@ -1131,7 +1131,7 @@ class OrderController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
-        $list = OrderClass::getAllByCondition($where, 'addTime DESC', ['id', 'orderSn', 'actPrice', 'addTime','remainDebtPrice']);
+        $list = OrderClass::getAllByCondition($where, 'addTime DESC', ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice']);
         $result = ['customInfo' => $info, 'list' => $list];
         util::success($result);
     }

app-hd/controllers/OrderController.php

@@ -46,10 +46,10 @@ class OrderController extends BaseController
         OrderClass::valid($order, $this->mainId);
         $orderSn = $order->orderSn ?? '';
         $totalFee = $order->orderPrice ?? 0;
+        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
+            util::success(['returnStatus' => 'SUCCESS']);
+        }
         if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
-                util::complete('订单已付款');
-            }
             util::complete('订单不是待付款状态');
         }
         $payWay = $cg->payWay ?? dict::getDict('payWay', 'wxPay');