支付

app-mall/controllers/OrderController.php

@@ -452,14 +452,17 @@ class OrderController extends BaseController
         //支付前验证订单有效性
         OrderService::checkBeforePay($order);
 
-        $name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买花材';
+        $name = !empty($order['orderName']) ? $order['orderName'] : '购买花材';
         $shop = $this->shop;
-        if (isset($shop->shopName) && !empty($shop->shopName)) {
+        if (empty($shop)) {
+            util::fail('没有找到门店信息');
+        }
+        if (!empty($shop->shopName)) {
             $name .= '(' . $shop->shopName . ')';
         }
         $totalFee = $order['mainPay'];
         $openId = '';
-        if (isset($post['miniOpenId']) && !empty($post['miniOpenId'])) {
+        if (!empty($post['miniOpenId'])) {
             $openId = $post['miniOpenId'];
             //noticeUtil::push('散客买花时，通过前端获取了openId:' . $openId, '15280215347');
         }
@@ -518,7 +521,6 @@ class OrderController extends BaseController
         $capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
 
         $sjExtend = WxOpenClass::getMallWxInfo();
-        $shop = $this->shop;
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
         $params = [