From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/api/controller/branch/Activity.php | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index 721688d..9200299 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -8,6 +8,7 @@
use app\api\model\branch\ActivityUser as ActivityUserModel; // 报名会员
use app\api\model\branch\Member as MemberModel; // 会员
use app\api\model\branch\ActivityFile as ActivityFileModel; // 活动文件
+use app\api\model\branch\ActivityCart as ActivityCartModel; // 活动购物车
// use app\api\model\user\BalanceOrder as BalanceOrderModel;
// use app\common\enum\order\OrderPayTypeEnum;
use app\common\enum\order\OrderTypeEnum;
@@ -38,7 +39,8 @@
{
$model = new ActivityModel;
$list = $model->getList($category_id, $this->postData(), $this->getUser());
- return $this->renderSuccess('', compact('list'));
+ $words = BranchSettingModel::getItem('words');
+ return $this->renderSuccess('', compact('list', 'words'));
}
/**
@@ -61,7 +63,7 @@
$points = SettingModel::getItem('points');
$detail['points_ratio'] = $points['discount']['discount_ratio']; // 积分抵扣比例
// 获取报名用户列表
- $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 8);
+ $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 7);
return $this->renderSuccess('', compact('detail', 'userList'));
}
@@ -95,7 +97,15 @@
return $this->renderSuccess('', compact('order_id'));
}
}
-
+ public function getRegistrationInformation($user_id = 0,$activity_id=0)
+ {
+ // 生成报名用户
+ $model = new ActivityUserModel();
+ $user=$this->getUser();
+ $userId = $user_id!=0?$user_id:$user['user_id'];
+ $registrationInformation = $model->getRegistrationInformation($userId,$activity_id);
+ return $this->renderSuccess('', compact('registrationInformation'));
+ }
/**
* 生成活动海报
*/
@@ -162,4 +172,29 @@
$user->setIncPoints(-$points, $describe);
return $this->renderSuccess('', '扣除成功');
}
+
+ /**
+ * 活动商品列表
+ **/
+ public function productLists($activity_id)
+ {
+ $model = new ActivityModel();
+ $activityDetail = $model->detail(['activity_id'=>$activity_id],[]);
+
+ if (!$activityDetail) {
+ return $this->renderError('活动不存在');
+ }
+ if ($activityDetail['status_text']['status'] != 1) {
+ return $this->renderError('活动未开始');
+ }
+ $data = $this->postData();
+ $user = $this->getUser();
+ $check_result = $model->checkUserCanSome($activityDetail,$user,$data);
+ if(!$check_result){
+ return $this->renderError($model->getError());
+ }
+ $list = $model->getGoodsList($activity_id);
+ $cart_total_num = ( new ActivityCartModel())->where(['activity_id'=>$activity_id,'user_id'=>$user['user_id']])->count();
+ return $this->renderSuccess('', compact('list','cart_total_num', 'activityDetail'));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2