From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/api/model/branch/ActivityUser.php | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index 638d92f..031641d 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -39,7 +39,7 @@
public function getListForUser($user_id, $params = [])
{
// 构建查询规则
- $model = $this->alias('A')->with(['activity' => ['branch', 'image']])
+ $model = $this->alias('A')->with(['activity' => ['branch', 'image'],'branch'])
->join('branch_activity B', 'B.activity_id = A.activity_id')
->field('A.*')
->visible(['activity' => ['name', 'image' => ['file_path'], 'branch' => ['name']]])
@@ -65,6 +65,7 @@
{
// 构建查询规则
$model = $this->alias('auser')
+ ->with('branch')
->field('auser.*,user.nickName,auser.real_name,user.avatarUrl')
->join('user', 'user.user_id = auser.user_id')
->where('auser.is_delete', '=', 0)
@@ -130,6 +131,10 @@
'branch_id' => $params['branch_id']?:0,
'app_id' => self::$app_id,
];
+ $refereeUser=(new UserModel())->where(['real_name'=>$params['recommend_name'],'mobile'=>$params['recommend_mobile']])->find();
+ if ($refereeUser){
+ $data['referee_id']=$refereeUser['user_id'];
+ }
// 如果是帮朋友报名，把用户信息记录下来
if ($params['is_friend']) {
$data['real_name'] = $params['real_name'];
@@ -137,12 +142,13 @@
$data['company'] = $params['company'];
$data['is_friend'] = 1;
$data['reg_user_id'] = $user['user_id']; // 记录是谁帮注册的，因为核销的时候会把user_id改为实际报名人的
+ }else{
+ if ($refereeUser){
+ $user->editReferee(['user_id'=>$user['user_id'],'referee_id'=>$refereeUser['user_id']]);
+ }
+ $user->save(['real_name'=>$params['real_name'],'mobile'=>$params['mobile'],'branch_id'=>$params['branch_id']]);
}
$data['trade_no'] = $data['order_no'];
- $refereeUser=(new UserModel())->where(['real_name'=>$params['recommend_name'],'mobile'=>$params['recommend_mobile']])->find();
- if ($refereeUser){
- $data['referee_id']=$refereeUser['user_id'];
- }
$this->save($data);
// 如果不需要在线支付
if ($data['online_money'] == 0) {
@@ -154,7 +160,19 @@
{
$list=$this->where('user_id', '=', $user_id)
->order('create_time', 'desc')->find();
- $data=[];
+ $data=[
+ 'province_id'=>'',
+ 'city_id'=>'',
+ 'region_id'=>'',
+ 'recommend_name'=>'',
+ 'recommend_mobile'=>'',
+ 'real_name'=>'',
+ 'mobile'=>'',
+ 'branch_id'=>'',
+ 'company'=>'',
+ 'branch_name'=>'',
+ 'region'=>'',
+ ];
if ($list){
$branch=(new Branch())->detail($list['branch_id']);
$data=[
@@ -241,6 +259,14 @@
$this->error = '报名未开始';
return false;
}
+ if(empty($params['real_name']) || empty($params['mobile'])){
+ $this->error = '请输入姓名和手机号';
+ return false;
+ }
+ /*if(empty($params['recommend_name']) || empty($params['recommend_mobile'])){
+ $this->error = '请输入推荐人姓名和手机号';
+ return false;
+ }*/
if ($activity["status_text"]["reg_status"] == 2){
$this->error = '报名已结束';
return false;
--
Gitblit v1.9.2