From 898043fc97d2ab8b793fd317a049b874ed207c6d Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 10 Dec 2025 20:12:31 +0800
Subject: [PATCH] 商户添加分类
---
admin/app/api/model/branch/ActivityUser.php | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index 818d2ca..b4b2e9e 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -14,7 +14,7 @@
use app\common\model\user\BalanceLog as BalanceLogModel;
use app\common\model\branch\User as BranchUserModel;
use app\common\model\branch\Setting as BranchSettingModel;
-
+use app\common\model\settings\Region as RegionModel;
/**
* 用户模型
*/
@@ -32,9 +32,9 @@
];
/**
- * 获取报名用户列表
+ * 获取用户报名的活动列表
*/
- public function getList($user_id, $params = [])
+ public function getListForUser($user_id, $params = [])
{
// 构建查询规则
$model = $this->alias('A')->with(['activity' => ['branch', 'image']])
@@ -96,9 +96,9 @@
{
$detail = ActivityModel::detail($params["activity_id"]);
// 如果用户还没加入连盟并且不是帮朋友报名
- if (!$params['is_member'] && !$params['is_friend']) {
+ /*if (!$params['is_member'] && !$params['is_friend']) {
$this->addMember($detail, $params, $user);
- }
+ }*/
// 验证数据
if (!$this->validateData($detail, $params, $user)) {
return false;
@@ -116,6 +116,15 @@
'status' => $params['online_money'] > 0 ? 0 : 1, //报名状态，如果不需要在线支付则则直接报名成功
'pay_type' => $params['pay_type'],
'in_radius' => $params['in_radius'],
+ 'province_id' => $params['province_id'],
+ 'city_id' => $params['city_id'],
+ 'region_id' => $params['region_id'],
+ 'company' => $params['company'],
+ 'recommend_name' => $params['recommend_name'],
+ 'recommend_mobile' => $params['recommend_mobile'],
+ 'real_name' => $params['recommend_name'],
+ 'mobile' => $params['mobile'],
+ 'branch_id' => $params['branch_id'],
'app_id' => self::$app_id,
];
// 如果是帮朋友报名，把用户信息记录下来
@@ -134,12 +143,35 @@
}
return $this;
}
+ public function getRegistrationInformation($user_id)
+ {
+ $list=$this->where('user_id', '=', $user_id)
+ ->order('create_time', 'desc')->find();
+ if (!$list){
+ }else{
+ $data=[
+ 'province_id'=>$list['province_id'],
+ 'city_id'=>$list['city_id'],
+ 'region_id'=>$list['region_id'],
+ 'recommend_name'=>$list['recommend_name'],
+ 'recommend_mobile'=>$list['recommend_mobile'],
+ 'real_name'=>$list['real_name'],
+ 'mobile'=>$list['mobile'],
+ 'branch_id'=>$list['branch_id'],
+ 'company'=>$list['company'],
+ 'branch_name'=>(new Branch())->detail($list['branch_id'])['name'],
+ 'region'=>RegionModel::getNameById($list['province_id']).','.RegionModel::getNameById($list['city_id']).','.RegionModel::getNameById($list['region_id']),
+ ];
+ }
+
+ return $data;
+ }
public function addMember($activity, $params, $user)
{
$data = [
'user_id' => $user['user_id'],
- 'branch_id' => $activity['branch_id'],
+ 'branch_id' => $params['branch_id'],
'real_name' => $params['real_name'],
'mobile' => $params['mobile'],
'company' => $params['company'],
@@ -304,9 +336,14 @@
$detail->save($data);
// 发放奖励
$setting = BranchSettingModel::getItem('basic');
- if ($setting['participate_user'] > 0) {
+ $participate_points = $setting['participate_user'];
+ $member = MemberModel::detail($user['user_id'], ['position']);
+ if ($member && $member['position'] && $member['position']['participate_points'] > 0) {
+ $participate_points = $member['position']['participate_points'];
+ }
+ if ($participate_points > 0) {
$describe = "活动签到获得奖励[活动ID：{$activity_id}]";
- $user->setIncPoints($setting['participate_user'], $describe);
+ $user->setIncPoints($participate_points, $describe);
}
return true;
}
--
Gitblit v1.9.2