|
@@ -140,6 +140,7 @@ class IntraCityController extends BaseController
|
|
|
if (empty($wxStoreId)) {
|
|
if (empty($wxStoreId)) {
|
|
|
util::fail('未创建门店，请先创建');
|
|
util::fail('未创建门店，请先创建');
|
|
|
}
|
|
}
|
|
|
|
|
+ $shop = $this->shop;
|
|
|
|
|
|
|
|
$adminId = $this->adminId;
|
|
$adminId = $this->adminId;
|
|
|
util::checkRepeatCommit($adminId, 4);
|
|
util::checkRepeatCommit($adminId, 4);
|
|
@@ -151,7 +152,6 @@ class IntraCityController extends BaseController
|
|
|
util::fail('地址缺失，请修改');
|
|
util::fail('地址缺失，请修改');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $shop = $this->shop;
|
|
|
|
|
$shopName = $shop->shopName ?? '';
|
|
$shopName = $shop->shopName ?? '';
|
|
|
$sjName = $shop->merchantName ?? '';
|
|
$sjName = $shop->merchantName ?? '';
|
|
|
$name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
|
|
$name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
|
