商城下单

app-mall/controllers/OrderController.php

@@ -455,8 +455,7 @@ class OrderController extends BaseController
     {
         $post = Yii::$app->request->post();
         $id = $post['id'];
-        $order = OrderService::getById($id);
-        OrderService::valid($order, $this->shopId);
+        $order = OrderClass::getById($id);
         if ($order['grade'] > 0) {
             util::fail('您已经评过了');
         }
@@ -471,12 +470,11 @@ class OrderController extends BaseController
         $orderSn = Yii::$app->request->get('orderSn', '');
         $detail = [];
         if (!empty($id)) {
-            $detail = OrderService::getOrderById($id);
+            $detail = OrderClass::getOrderById($id);
         }
         if (!empty($orderSn)) {
-            $detail = OrderService::getOrderBySn($orderSn);
+            $detail = OrderClass::getOrderBySn($orderSn);
         }
-        OrderService::valid($detail, $this->shopId);
         util::success($detail);
     }
 

biz-mall/order/classes/OrderClass.php

@@ -111,7 +111,8 @@ class OrderClass extends BaseClass
         if (empty($order)) {
             return [];
         }
-        $order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
+        $orderSn = $order->orderSn ?? '';
+        $order['goodsInfoList'] = OrderGoodsClass::getGoodsListBySn($orderSn);
         return $order;
     }
 

biz-mall/order/classes/OrderGoodsClass.php

@@ -11,6 +11,20 @@ class OrderGoodsClass extends BaseClass
 
     public static $baseFile = '\bizMall\order\models\OrderGoods';
 
+    //取订单 ssh 2020.1.2
+    public static function getGoodsListBySn($sn)
+    {
+        $arr = self::getAllByCondition(['orderSn' => $sn], null, '*');
+        if (empty($arr)) {
+            return [];
+        }
+        foreach ($arr as $key => $val) {
+            $val = business::formatOrderGoodsCover($val);
+            $arr[$key] = $val;
+        }
+        return $arr;
+    }
+
     //取订单 ssh 2020.1.2
     public static function getGoodsListById($id)
     {

biz-mall/order/services/OrderService.php

@@ -84,18 +84,6 @@ class OrderService extends BaseService
         }
     }
 
-    //商家验证是否有效 ssh 2019.12.15
-    public static function valid($order, $shopId)
-    {
-        OrderClass::setExpire($order);
-        if (empty($order)) {
-            util::fail('订单无效');
-        }
-        if ($order['shopId'] != $shopId) {
-            util::fail('不是您的订单');
-        }
-    }
-
     //根据编号查询 ssh 2019.12.14
     public static function getByOrderSn($orderSn)
     {