shish 4 jaren geleden
bovenliggende
commit
53c4869432
2 gewijzigde bestanden met toevoegingen van 16 en 11 verwijderingen
  1. 2 9
      app-mall/controllers/OrderController.php
  2. 14 2
      biz-mall/order/classes/OrderClass.php

+ 2 - 9
app-mall/controllers/OrderController.php

@@ -151,7 +151,7 @@ class OrderController extends BaseController
                 'goodsId' => $goodsId,
                 'userId' => $this->userId,
                 'sjId' => $this->sjId,
-                'title' => $goodsInfo['name'],
+                'name' => $goodsInfo['name'] ?? '',
                 'cover' => $currentCover,
                 'unitPrice' => $unitPrice,
                 'num' => $goodsNum,
@@ -508,14 +508,7 @@ class OrderController extends BaseController
     public function actionDetail()
     {
         $id = Yii::$app->request->get('id', 0);
-        $orderSn = Yii::$app->request->get('orderSn', '');
-        $detail = [];
-        if (!empty($id)) {
-            $detail = OrderClass::getOrderById($id);
-        }
-        if (!empty($orderSn)) {
-            $detail = OrderClass::getOrderBySn($orderSn);
-        }
+        $detail = OrderClass::getOrderById($id);
         util::success($detail);
     }
 

+ 14 - 2
biz-mall/order/classes/OrderClass.php

@@ -9,6 +9,7 @@ use bizMall\shop\classes\MainClass;
 use bizMall\shop\classes\ShopClass;
 use bizMall\stat\classes\StatOrderClass;
 use bizMall\user\classes\UserClass;
+use common\components\imgUtil;
 use common\components\miniUtil;
 use common\components\orderSn;
 use bizMall\base\classes\BaseClass;
@@ -106,8 +107,19 @@ class OrderClass extends BaseClass
         if (empty($order)) {
             return [];
         }
-        $orderSn = $order->orderSn ?? '';
-        $order['goodsInfoList'] = OrderGoodsClass::getGoodsListBySn($orderSn);
+        $orderSn = $order['orderSn'] ?? '';
+        if (empty($orderSn)) {
+            return [];
+        }
+        $goodsList = OrderGoodsClass::getAllByCondition(['orderSn' => $orderSn], null, '*');
+        if (!empty($goodsList)) {
+            foreach ($goodsList as $key => $val) {
+                $shortCover = $val['cover'] ?? '';
+                $cover = imgUtil::groupImg($shortCover);
+                $goodsList[$key]['cover'] = $cover;
+            }
+        }
+        $order['goodsInfoList'] = $goodsList;
         return $order;
     }