From 4e0e36178d82ed486d8cec2c8f52ca96d715cc12 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 30 Oct 2025 19:16:05 +0800
Subject: [PATCH] 1、活动增加促销商品(完成后端) 2、修复小程序端活动相册下载不了的问题; 3、修复小程序端活动详情定位问题; 4、修复小程序端报名时免费的也弹出支付弹窗的问题; 5、修复分会后台活动核销码下载问题。

---
 admin/app/api/controller/Controller.php |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/admin/app/api/controller/Controller.php b/admin/app/api/controller/Controller.php
index 21e311d..da4dc9d 100644
--- a/admin/app/api/controller/Controller.php
+++ b/admin/app/api/controller/Controller.php
@@ -10,6 +10,9 @@
 use app\JjjController;
 use think\facade\Env;
 use think\facade\Cache;
+use app\api\model\branch\Branch as BranchModel;
+use app\common\model\branch\User as BranchUserModel;
+
 /**
  * API控制器基类
  */
@@ -94,6 +97,20 @@
         return $user['supplierUser'];
     }
 
+    /**
+     * 获取当前用户分会信息
+     */
+    protected function getBranch($user)
+    {
+        // 判断用户是不是分会管理员
+        $user = BranchUserModel::detail(['user_id' => $user['user_id']]);
+        if (!$user) {
+            throw new BaseException(['msg' => '您不是分会的管理员,无法操作', 'code' => -1]);
+        }
+        return BranchModel::detail($user['branch_id']);
+    }
+
+
 
     protected function getShareParams($url, $title = '', $desc = '', $link = '', $imgUrl = '')
     {

--
Gitblit v1.9.2