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 |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index d0cc402..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;
 /**
  * 用户模型
  */
@@ -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,7 +143,30 @@
         }
         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 = [

--
Gitblit v1.9.2