From abc7edc3c8ad59ff213c85413d0d6a10d7a0b6f7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 17 Dec 2025 18:03:09 +0800
Subject: [PATCH] 1. 发布供需消耗连盟币，连盟币数量在后台独立设置 2. 小程序供需个人中心可自由切换身份 3. 增加私信系统 4. 增加评论系统，用户可在发布者详情页进行评论操作，评论获得的连盟币可在后台设置 5. 增加发布者的等级，以好评个数为条件进行升级，小程序端会显示该等级的图标，如没有等级则不会显示图标 6. 增加设置消耗连盟币可以解锁、查看发布的信息，费用可在后台设置 7. 小程序供需大厅界面优化，以及增加了推荐栏目，该栏目按发布的分类相似进行匹配，比如A用户发布了 互联网 分类的需求，则会优先推荐匹配互联网分类的供应需求给他。
---
admin/app/api/model/branch/ActivityUser.php | 88 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index aa65b02..792b2dd 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -2,6 +2,7 @@
namespace app\api\model\branch;
+use app\api\model\user\User;
use app\common\enum\order\OrderPayTypeEnum;
use app\common\model\branch\ActivityUser as ActivityUserModel;
use app\api\model\branch\Member as MemberModel;
@@ -14,7 +15,8 @@
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;
+use app\api\model\user\User as UserModel;
/**
* 用户模型
*/
@@ -37,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']]])
@@ -63,7 +65,8 @@
{
// 构建查询规则
$model = $this->alias('auser')
- ->field('auser.*,user.nickName,user.real_name,user.avatarUrl')
+ ->with('branch')
+ ->field('auser.*,user.nickName,auser.real_name,user.avatarUrl')
->join('user', 'user.user_id = auser.user_id')
->where('auser.is_delete', '=', 0)
->where('auser.status', '=', 1)
@@ -96,26 +99,36 @@
{
$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;
}
+
$data = [
'user_id' => $user['user_id'],
'order_no' => $this->orderNo(),
- 'activity_id' => $detail['activity_id'],
- 'total_price' => $detail['fee'],
- 'pay_price' => $detail['fee'],
- 'points_num' => $params['points_num'], // 积分抵扣数量
- 'points_money' => $params['points_money'], // 积分抵扣金额
- 'balance' => $params['balance'], // 余额
- 'online_money' => $params['online_money'], // 需在线支付的金额
+ 'activity_id' => $detail['activity_id']?:0,
+ 'total_price' => $detail['fee']?:0,
+ 'pay_price' => $detail['fee']?:0,
+ 'points_num' => $params['points_num']?:0, // 积分抵扣数量
+ 'points_money' => $params['points_money']?:0, // 积分抵扣金额
+ 'balance' => $params['balance']?:0, // 余额
+ 'online_money' => $params['online_money']?:0, // 需在线支付的金额
'status' => $params['online_money'] > 0 ? 0 : 1, //报名状态，如果不需要在线支付则则直接报名成功
- 'pay_type' => $params['pay_type'],
- 'in_radius' => $params['in_radius'],
+ 'pay_type' => $params['pay_type']?:0,
+ 'in_radius' => $params['in_radius']?:0,
+ 'province_id' => $params['province_id']?:0,
+ 'city_id' => $params['city_id']?:0,
+ 'region_id' => $params['region_id']?:0,
+ 'company' => $params['company']?:'',
+ 'recommend_name' => $params['recommend_name']?:'',
+ 'recommend_mobile' => $params['recommend_mobile']?:'',
+ 'real_name' => $params['real_name']?:'',
+ 'mobile' => $params['mobile']?:'',
+ 'branch_id' => $params['branch_id']?:0,
'app_id' => self::$app_id,
];
// 如果是帮朋友报名，把用户信息记录下来
@@ -127,6 +140,10 @@
$data['reg_user_id'] = $user['user_id']; // 记录是谁帮注册的，因为核销的时候会把user_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) {
@@ -134,12 +151,53 @@
}
return $this;
}
+ public function getRegistrationInformation($user_id,$activity_id=0)
+ {
+ $list=$this->where('user_id', '=', $user_id)
+ ->order('create_time', 'desc')->find();
+ $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=[
+ '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'=>$branch?$branch['name']:'',
+ 'region'=>RegionModel::getNameById($list['province_id']).','.RegionModel::getNameById($list['city_id']).','.RegionModel::getNameById($list['region_id']),
+ ];
+ }
+ if($activity_id){
+ $activity=(new ActivityModel())->find($activity_id);
+ if ($activity){
+ $data['activity_number']=(new ActivityModel())->where(['branch_id'=>$activity['branch_id'],'category_id'=>$activity['category_id']])->count();
+ }
+ }
+ 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'],
--
Gitblit v1.9.2