From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件

---
 admin/app/shop/controller/branch/Branch.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/app/shop/controller/branch/Branch.php b/admin/app/shop/controller/branch/Branch.php
index b38e914..4b01531 100644
--- a/admin/app/shop/controller/branch/Branch.php
+++ b/admin/app/shop/controller/branch/Branch.php
@@ -12,7 +12,6 @@
 use app\shop\model\settings\Setting as SettingModel;
 use app\common\service\qrcode\BranchService;
 use app\common\model\settings\Region as RegionModel;
-use app\common\library\fbpay\FbPay as FbPayModel;
 
 /**
  * 分会控制器
@@ -25,10 +24,13 @@
      */
     public function index()
     {
-        (new FbPayModel(false))->notify();
         $model = new BranchModel;
         $postData = $this->postData();
         $list = $model->getList($postData);
+        foreach ($list as $key => $value) {
+            $list[$key]['member_num'] = $list[$key]['member_num']+(new \app\shop\model\branch\ActivityUser())
+                    ->group('user_id')->where(['branch_id'=>$value['branch_id']])->count();
+        }
         return $this->renderSuccess('', compact('list'));
     }
 

--
Gitblit v1.9.2