ryan 2 недель назад
Родитель
Сommit
ecb8ea3164
1 измененных файлов с 14 добавлено и 2 удалено
  1. 14 2
      frontendApi/modules/v1/controllers/ShopController.php

+ 14 - 2
frontendApi/modules/v1/controllers/ShopController.php

@@ -681,10 +681,22 @@ class ShopController extends BaseController {
         foreach ($data['list'] as $key => $value) {
             if (($value['PAY_TYPE'] == 'pay_stack') && in_array($value['STATUS'], [\Yii::$app->params['orderStatus']['notPaid']['value'], \Yii::$app->params['orderStatus']['failPaid']['value']])) {
                 // 订单中间表
-                $orderGoods = ApproachOrderGoods::findAllAsArray('ORDER_SN=:SN', [':SN' => $value['SN']], 'SKU_CODE,GOODS_TITLE,BUY_NUMS,TAX_RATE,REAL_PV,REAL_PRICE');
+                $orderGoods = ApproachOrderGoods::find()
+                    ->alias('OG')
+                    ->select(['OG.SKU_CODE', 'OG.GOODS_TITLE', 'OG.BUY_NUMS', 'OG.TAX_RATE', 'OG.REAL_PV', 'OG.REAL_PRICE', 'SG.COVER'])
+                    ->leftJoin(ShopGoods::tableName() . ' SG', 'SG.ID = OG.GOODS_ID')
+                    ->where(['OG.ORDER_SN' => $value['SN']])
+                    ->asArray()
+                    ->all();
             } else {
                 // 订单表
-                $orderGoods = OrderGoods::findAllAsArray('ORDER_SN=:SN', [':SN' => $value['SN']], 'SKU_CODE,GOODS_TITLE,BUY_NUMS,TAX_RATE,REAL_PV,REAL_PRICE');
+                $orderGoods = OrderGoods::find()
+                    ->alias('OG')
+                    ->select(['OG.SKU_CODE', 'OG.GOODS_TITLE', 'OG.BUY_NUMS', 'OG.TAX_RATE', 'OG.REAL_PV', 'OG.REAL_PRICE', 'SG.COVER'])
+                    ->leftJoin(ShopGoods::tableName() . ' SG', 'SG.ID = OG.GOODS_ID')
+                    ->where(['OG.ORDER_SN' => $value['SN']])
+                    ->asArray()
+                    ->all();
             }
             $data['list'][$key]['hasChildren'] = $orderGoods;
             $data['list'][$key]['ORDER_TYPE'] = $value['ORDER_TYPE']=='ZC' ? 'Welcome Pack' : (in_array($value['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points');