|
@@ -460,7 +460,7 @@ class OrderController extends BaseController
|
|
|
if (empty($shop)) {
|
|
if (empty($shop)) {
|
|
|
util::fail('没有找到门店');
|
|
util::fail('没有找到门店');
|
|
|
}
|
|
}
|
|
|
- if (!empty($shop->shopName)) {
|
|
|
|
|
|
|
+ if (isset($shop->shopName) && !empty($shop->shopName)) {
|
|
|
$name .= '(' . $shop->shopName . ')';
|
|
$name .= '(' . $shop->shopName . ')';
|
|
|
}
|
|
}
|
|
|
$totalFee = $order['mainPay'];
|
|
$totalFee = $order['mainPay'];
|
|
@@ -524,7 +524,6 @@ class OrderController extends BaseController
|
|
|
$capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
|
|
$capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
|
|
|
|
|
|
|
|
$sjExtend = WxOpenClass::getMallWxInfo();
|
|
$sjExtend = WxOpenClass::getMallWxInfo();
|
|
|
- $shop = $this->shop;
|
|
|
|
|
$merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
|
|
$merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
|
|
|
$lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
|
|
$lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
|
|
|
$params = [
|
|
$params = [
|
