|
@@ -302,8 +302,9 @@ class GhsController extends BaseController
|
|
|
|
|
|
|
|
// 弃用 buyNotice, 使用 xhShopExt 表里的 purchaseGuide
|
|
// 弃用 buyNotice, 使用 xhShopExt 表里的 purchaseGuide
|
|
|
// $info['buyNotice'] = $ghsShop->buyNotice ?? 0;
|
|
// $info['buyNotice'] = $ghsShop->buyNotice ?? 0;
|
|
|
- $shopExt = ShopExtClass::getByCondition(['shopId' => $ghsShopId], false, false, 'purchaseGuide,hcFreeKm,hcMap');
|
|
|
|
|
|
|
+ $shopExt = ShopExtClass::getByCondition(['shopId' => $ghsShopId], false, false, 'purchaseGuide,purchaseGuideText,hcFreeKm,hcMap');
|
|
|
$ghsInfo['buyNotice'] = $shopExt['purchaseGuide'] > 0 ? 1 : 0; //兼容原有设定:购买须知 0.没有 1.有
|
|
$ghsInfo['buyNotice'] = $shopExt['purchaseGuide'] > 0 ? 1 : 0; //兼容原有设定:购买须知 0.没有 1.有
|
|
|
|
|
+ $ghsInfo['buyNoticeText'] = $shopExt['purchaseGuideText'] ?? '';
|
|
|
|
|
|
|
|
//判断是否开启同城配送功能
|
|
//判断是否开启同城配送功能
|
|
|
$intraCityRet = ShopClass::hasIntraCity($ghsShop);
|
|
$intraCityRet = ShopClass::hasIntraCity($ghsShop);
|