价格

app-mall/controllers/OrderController.php

@@ -460,7 +460,7 @@ class OrderController extends BaseController
         if (empty($shop)) {
             util::fail('没有找到门店');
         }
-        if (isset($shop->shopName) && !empty($shop->shopName)) {
+        if (!empty($shop->shopName)) {
             $name .= '(' . $shop->shopName . ')';
         }
         $totalFee = $order['mainPay'];
@@ -768,7 +768,7 @@ class OrderController extends BaseController
 
         } elseif ($payWay == 1) {
             //支付宝
-            $totalFee = $order->actPrice;
+            $totalFee = $actPrice;
             $subject = '购买花材';
             $capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
             $shop = $this->shop;