From 6e0b38b0ea6669d532e9d2279a81ca3963e0f3ad Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 13 Nov 2025 00:14:05 +0800
Subject: [PATCH] 1、小程序端列出所有报名人员名单（含姓名）； 2、优化活动促销商品； 3、优化小程序端活动详情页； 4、优化后台连盟活动修改页面，并展示促销商品； 5、参与活动人员积分设置改到职务里添加。
---
admin/app/common/model/file/UploadGroup.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/admin/app/common/model/file/UploadGroup.php b/admin/app/common/model/file/UploadGroup.php
index d69f8b4..6359944 100644
--- a/admin/app/common/model/file/UploadGroup.php
+++ b/admin/app/common/model/file/UploadGroup.php
@@ -16,18 +16,21 @@
/**
* 分组详情
*/
- public static function detail($group_id, $shop_supplier_id = 0) {
- return (new static())->where('shop_supplier_id', '=', $shop_supplier_id)->find($group_id);
+ public static function detail($group_id, $shop_supplier_id = 0, $branch_id = 0) {
+ return (new static())->where('shop_supplier_id', '=', $shop_supplier_id)
+ ->where('branch_id', '=', $branch_id) // by lyzflash
+ ->find($group_id);
}
/**
* 获取列表记录
*/
- public function getList($groupType = '', $shop_supplier_id = 0)
+ public function getList($groupType = '', $shop_supplier_id = 0, $branch_id = 0)
{
$model = $this;
!empty($groupType) && $model = $model->where('group_type', '=', trim($groupType));
return $model->where('shop_supplier_id', '=', $shop_supplier_id)
+ ->where('branch_id', '=', $branch_id)
->where('is_delete', '=', 0)
->order(['sort' => 'asc', 'create_time' => 'desc'])
->select();
--
Gitblit v1.9.2