From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
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