支付

app-mall/controllers/GoodsController.php

@@ -3,6 +3,7 @@
 namespace mall\controllers;
 
 use bizMall\goods\classes\GoodsClass;
+use bizMall\goods\classes\GoodsSettingClass;
 use bizMall\goods\services\CategoryService;
 use bizMall\goods\services\GoodsCategoryService;
 use bizMall\goods\services\GoodsService;
@@ -18,12 +19,11 @@ class GoodsController extends BaseController
     public function actionDetail()
     {
         $id = Yii::$app->request->get('id', 0);
-
-        $info = GoodsService::getGoodsInfo($id);
+        $info = GoodsClass::getGoodsInfo($id);
         GoodsService::valid($info, $this->mainId);
-        $setting = GoodsSettingService::getByCondition(['mainId' => $this->mainId]);
-        $commonIntro = isset($setting['goodsIntroduce']) ? $setting['goodsIntroduce'] : '';
-        $info['commonIntro'] = $commonIntro;
+        $setting = GoodsSettingClass::getByCondition(['mainId' => $this->mainId]);
+        $intro = isset($setting['goodsIntroduce']) ? $setting['goodsIntroduce'] : '';
+        $info['commonIntro'] = $intro;
         util::success($info);
     }
 

app-mall/controllers/OrderController.php

@@ -161,7 +161,7 @@ class OrderController extends BaseController
             ];
             OrderGoodsService::add($data);//创建订单商品列表
             $transaction->commit();
-            util::success(['orderSn' => $orderSn, 'totalPrice' => $actPrice, 'couponId' => $couponId]);
+            util::success(['orderSn' => $orderSn, 'totalPrice' => $actPrice, 'couponId' => $couponId, 'id' => $orderId]);
         } catch (Exception $e) {
             $transaction->rollBack();
             Yii::info("失败原因：" . $e->getMessage());
@@ -512,4 +512,12 @@ class OrderController extends BaseController
         util::success($detail);
     }
 
+    //获取详情 ssh 20220512
+    public function actionInfo()
+    {
+        $sn = Yii::$app->request->get('orderSn', '');
+        $detail = OrderClass::getOrderBySn($sn);
+        util::success($detail);
+    }
+
 }

biz-mall/goods/classes/GoodsClass.php

@@ -5,6 +5,7 @@ namespace bizMall\goods\classes;
 use bizMall\goods\services\GoodsCategoryService;
 use bizMall\merchant\services\MerchantService;
 use common\components\business;
+use common\components\imgUtil;
 use common\components\stringUtil;
 use common\components\util;
 use Yii;
@@ -24,7 +25,6 @@ class GoodsClass extends BaseClass
         }
         $list = self::groupGoodsBaseInfo([$info]);
         $info = current($list);
-        //商品的分类
         $category = GoodsCategoryService::getGoodsHasCategoryIds($id);
         $info['categoryIdList'] = $category;
         return $info;
@@ -41,13 +41,12 @@ class GoodsClass extends BaseClass
         $rise = GoodsSettingClass::getRise($sjId);
 
         foreach ($list as $key => $val) {
-            $id = $val['id'];
             //大中小图片转化
             $val = business::formatGoodsImg($val);
             //免费配送范围
             $val['freeSendDist'] = 5;
             //多款式
-            $val['goodsStyleList'] = isset($val['goodsStyle']) && $val['goodsStyle'] == 1 ? GoodsStyleClass::getStyleList($id) : [];
+            $val['goodsStyleList'] = [];
             $val['createDate'] = date("Y-m-d", strtotime($val['createTime']));
             //节日涨价
             if (!empty($rise)) {
@@ -63,6 +62,9 @@ class GoodsClass extends BaseClass
             //临时加100块
             //$price = $val['price'];
             //$val['price'] = $price + 100;
+            $shortCover = $val['cover'] ?? '';
+            $val['cover'] = imgUtil::groupImg($shortCover);
+            $val['shortCover'] = $shortCover;
             $list[$key] = $val;
         }
         return $list;

biz-mall/order/classes/OrderClass.php

@@ -130,8 +130,15 @@ class OrderClass extends BaseClass
         if (empty($order)) {
             return [];
         }
-        $id = $order['id'];
-        $order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
+        $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;
     }