From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次，在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访
---
admin/app/branch/controller/activity/Activity.php | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/admin/app/branch/controller/activity/Activity.php b/admin/app/branch/controller/activity/Activity.php
index c0aa703..d7d0178 100644
--- a/admin/app/branch/controller/activity/Activity.php
+++ b/admin/app/branch/controller/activity/Activity.php
@@ -7,7 +7,7 @@
use app\branch\model\category\Category as CategoryModel;
use app\shop\model\user\User as UserModel;
use app\common\service\qrcode\BranchActivityService;
-use app\branch\model\activityProduct\ActivityProduct as ActivityProductModel;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
/**
* 活动控制器
@@ -22,6 +22,28 @@
$model = new ActivityModel;
$list = $model->getList($this->postData(), $this->getBranchId());
return $this->renderSuccess('', compact('list'));
+ }
+
+ /**
+ * 审核活动列表（审核所有活动）
+ */
+ public function auditList()
+ {
+ $model = new ActivityModel;
+ $list = $model->getAuditList($this->postData());
+ return $this->renderSuccess('', compact('list'));
+ }
+
+ /**
+ * 审核活动
+ */
+ public function audit($activity_id)
+ {
+ $model = new ActivityModel;
+ if ($model->audit($activity_id, $this->postData())) {
+ return $this->renderSuccess('审核成功');
+ }
+ return $this->renderError($model->getError() ?: '审核失败');
}
/**
@@ -59,8 +81,9 @@
*/
public function detail($activity_id)
{
- $model = new ActivityModel;
- return $this->renderSuccess('', $model->detail($activity_id));
+ $model = (new ActivityModel)->detail($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+ return $this->renderSuccess('', $model);
}
/**
@@ -86,7 +109,7 @@
// if ($model['verify_user_ids']) {
// $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
// }
- $model['product_list'] = (new ActivityProductModel())->getProductPricelist($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
$product_ids = [];
if(!empty($model['product_list'])){
$product_ids = array_column($model['product_list'], 'product_id');
--
Gitblit v1.9.2