|
|
@@ -28,7 +28,7 @@ use common\components\lakala\Lakala;
|
|
|
class OrderController extends BaseController
|
|
|
{
|
|
|
|
|
|
- //二维码收款使用
|
|
|
+ //二维码收款使用
|
|
|
public $guestAccess = ['order-relate', 'fast-pay'];
|
|
|
|
|
|
//记账单列表 ssh 20250627
|
|
|
@@ -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');
|
|
|
}
|