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/common/model/plus/bonus/Order.php | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/admin/app/common/model/plus/bonus/Order.php b/admin/app/common/model/plus/bonus/Order.php
index 5eea4ac..ddb6e2b 100644
--- a/admin/app/common/model/plus/bonus/Order.php
+++ b/admin/app/common/model/plus/bonus/Order.php
@@ -4,7 +4,8 @@
use app\common\model\BaseModel;
use app\common\enum\order\OrderTypeEnum;
-use app\common\model\plus\bonus\User as UserModel;
+use app\common\model\plus\bonus\User as BonusUserModel;
+use app\common\model\user\User as UserModel;
/**
* 队长订单模型
*/
@@ -190,7 +191,7 @@
public static function getUserOrderCount($user_id)
{
- return (new static())->where('second_user_id', '=', $user_id)
+ return (new static())->where(['second_user_id'=>$user_id,'is_invalid'=>0])
->count();
}
@@ -208,7 +209,7 @@
return false;
}
// 获取当前买家的直推奖用户id和业绩奖用户id
- $agentUser = $model->getAgentUserId($order, $setting['begin_num']);
+ $agentUser = $model->getAgentUserId($order, $setting['begin_num'], $setting);
// 无分红用户
if (!$agentUser['first_user_id'] && !$agentUser['second_user_id']) {
return false;
@@ -236,7 +237,7 @@
'order_id' => $order['order_id'],
'order_type' => $order_type,
'order_price' => bcsub($order['pay_price'], $order['express_price'], 2),
- 'first_money' => $agentUser['first_user_id'] > 0 ? $one_money : 0,
+ 'first_money' => $one_money,
'second_money' => $two_money,
'first_user_id' => $one_money > 0 ?$agentUser['first_user_id']:0,
'second_user_id' => $agentUser['second_user_id'],
@@ -251,21 +252,26 @@
/**
* 获取当前买家的所有上级分销商用户id
*/
- private function getAgentUserId($order, $begin_num)
+ private function getAgentUserId($order, $begin_num, $setting)
{
- $user = UserModel::detail($order['user_id']);
+ $user = BonusUserModel::detail($order['user_id']);
if (empty($user['parent_id'])) {
$second_user_id = 0;
} else {
- $second_user_id = UserModel::getSecondUserId($user['user_id'], $begin_num, $order);
+ $second_user_id = BonusUserModel::getSecondUserId($user['user_id'], $begin_num, $order);
}
if ($second_user_id==0){
$subsidy_user_id = 0;
}else{
- $subsidy_user_id = UserModel::getSubsidyUserId($second_user_id); //补贴用户
+ $subsidy_user_id = BonusUserModel::getSubsidyUserId($second_user_id); //补贴用户
+ if ($subsidy_user_id!=0){
+ if (!UserModel::getOperatingSubsidy($subsidy_user_id,$setting)){
+ $subsidy_user_id = 0;
+ }
+ }
}
$agentUser = [
- 'first_user_id' => UserModel::getFirstUserId($order['user_id']), //直推用户
+ 'first_user_id' => BonusUserModel::getFirstUserId($order['user_id']), //直推用户
'second_user_id' => $second_user_id, //业绩奖用户
'subsidy_user_id'=>$subsidy_user_id, //补贴用户
];
--
Gitblit v1.9.2