|
|
@@ -33,7 +33,6 @@ class GhsController extends BaseController
|
|
|
$ghsShopId = $info['shopId'] ?? 0;
|
|
|
$ghsShop = ShopClass::getById($ghsShopId, true);
|
|
|
$info['hasRechargeHb'] = $ghsShop->recharge ?? 0;
|
|
|
-
|
|
|
$hb = RechargeHbClass::getByCondition(['shopId' => $ghsShopId, 'delStatus' => 0], true, 'totalHb DESC');
|
|
|
$info['hasRechargeHbAmount'] = $hb->totalHb ?? 0;
|
|
|
|
|
|
@@ -46,6 +45,14 @@ class GhsController extends BaseController
|
|
|
$shopId = Yii::$app->request->get('shopId');
|
|
|
if (isset($this->shopId) && !empty($this->shopId)) {
|
|
|
$ghs = GhsClass::build($shopId, $this->shopId);
|
|
|
+
|
|
|
+ //是否有充值送红包活动
|
|
|
+ $ghsShopId = $ghs['shopId'] ?? 0;
|
|
|
+ $ghsShop = ShopClass::getById($ghsShopId, true);
|
|
|
+ $ghs['hasRechargeHb'] = $ghsShop->recharge ?? 0;
|
|
|
+ $hb = RechargeHbClass::getByCondition(['shopId' => $ghsShopId, 'delStatus' => 0], true, 'totalHb DESC');
|
|
|
+ $ghs['hasRechargeHbAmount'] = $hb->totalHb ?? 0;
|
|
|
+
|
|
|
} else {
|
|
|
//没有开店也给显示供应商信息
|
|
|
$shop = ShopClass::getShopInfo($shopId);
|