|
|
@@ -74,13 +74,18 @@ class ShopClass extends BaseClass
|
|
|
util::fail('门店名称已经存在');
|
|
|
}
|
|
|
//补充fullAddress linqh 2021.4.18
|
|
|
- $data['fullAddress'] = $data['province'].$data['city'].$data['address'].$data['floor'];
|
|
|
+ $data['fullAddress'] = $data['province'] . $data['city'] . $data['address'] . $data['floor'];
|
|
|
+ $img = json_encode([]);
|
|
|
+ if (isset($data['img']) && !empty($data['img'])) {
|
|
|
+ $img = json_encode($data['img']);
|
|
|
+ }
|
|
|
+ $data['img'] = $img;
|
|
|
$shop = self::add($data);
|
|
|
$newShopId = $shop['id'];
|
|
|
//初始化花材 linqh 2021.5.11
|
|
|
- $adminId = $data['adminId']??0;
|
|
|
- $shopId = $data['shopId']??0;
|
|
|
- ProductClass::newShopInitProduct($data['merchantId'],$shopId,$newShopId,$adminId);
|
|
|
+ $adminId = $data['adminId'] ?? 0;
|
|
|
+ $shopId = $data['shopId'] ?? 0;
|
|
|
+ ProductClass::newShopInitProduct($data['merchantId'], $shopId, $newShopId, $adminId);
|
|
|
return $shop;
|
|
|
}
|
|
|
|