模拟

app-ghs/controllers/ExpressController.php

@@ -4,6 +4,7 @@ namespace ghs\controllers;
 
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\express\classes\ExpressClass;
+use bizGhs\express\classes\GhsExpressOrderClass;
 use bizGhs\order\classes\OrderClass;
 use common\components\dict;
 use common\components\imgUtil;
@@ -14,6 +15,22 @@ use Yii;
 class ExpressController extends BaseController
 {
     public $guestAccess = ['get-has-map'];
+
+    public function actionDetail()
+    {
+        $get = Yii::$app->request->get();
+        $orderId = $get['orderId'] ?? 0;
+        $order = OrderClass::getById($orderId, true);
+        if (empty($order)) {
+            util::fail('没有找到订单');
+        }
+        if ($order->mainId != $this->mainId) {
+            util::fail('不是你的订单');
+        }
+        $express = GhsExpressOrderClass::getByCondition(['orderId' => $orderId, 'status' => 1], true);
+        util::success($express);
+    }
+
     // 获取字典中的 hasMap
     public function actionGetHasMap()
     {

app-hd/controllers/ExpressController.php

@@ -9,11 +9,8 @@ use bizHd\merchant\services\ShopService;
 use bizHd\order\classes\OrderClass;
 use bizHd\purchase\classes\PurchaseClass;
 use common\components\dict;
-use common\components\IntraCityExpress;
-use common\components\noticeUtil;
 use Yii;
 use common\components\util;
-use yii\db\Query;
 
 class ExpressController extends BaseController
 {
@@ -74,38 +71,13 @@ class ExpressController extends BaseController
     // 配送详情
     public function actionDetail()
     {
-        $post = Yii::$app->request->post();
-        $orderId = intval($post['orderId']);
-
+        $get = Yii::$app->request->get();
+        $orderId = $get['orderId'] ?? 0;
         $order = OrderClass::getById($orderId, false, 'id, mainId, sendStatus');
         if ($order['mainId'] != $this->mainId) {
-            util::fail('订单未找到');
-        }
-
-        // 检查是否存在重复的订单：如果存在，则使用最后一个订单的 store_order_id
-        $storeOrderId = $orderId; // ------------------------------------- 注意区分：$storeOrderId ， $orderId 。它们有可能不相同
-        $query = (new Query())
-            ->from('xhExpressOrder')
-            ->where(['and',
-                new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId]),
-                ['mainId' => $this->mainId]
-            ])->orderBy('addTime DESC');
-        $esDatas = $query->all();
-
-        $count = count($esDatas);
-        $es = null;
-        if ($count > 0) {
-            $es = $esDatas[0];
-            //$storeOrderId = $es['storeOrderId'];
-            if ($count > 1) {
-                //noticeUtil::push('一个订单有多个配送订单');
-            }
-        }
-
-        if (!empty($es)) {
-            util::success($es, "查询成功");
-        } else {
-            util::complete();
+            util::fail('不是你的订单');
         }
+        $express = ExpressOrderClass::getByCondition(['orderId' => $orderId, 'status' => 1], true);
+        util::success($express);
     }
 }