From a90ac240c499e686793744b25732b6ac6a57edfd Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 10:46:51 +0800
Subject: [PATCH] 1、商家端添加会员管理 2、修复分会绑定会长时获取获取会员信息报错 3、修复添加分会成员是没保存分会id问题 4、修复获取分会成员时获取的是所有的分会的成员
---
admin/app/common/model/plus/bonus/Order.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/admin/app/common/model/plus/bonus/Order.php b/admin/app/common/model/plus/bonus/Order.php
index 2e3a605..d7a2799 100644
--- a/admin/app/common/model/plus/bonus/Order.php
+++ b/admin/app/common/model/plus/bonus/Order.php
@@ -5,7 +5,6 @@
use app\common\model\BaseModel;
use app\common\enum\order\OrderTypeEnum;
use app\common\model\plus\bonus\User as UserModel;
-
/**
* 队长订单模型
*/
@@ -208,17 +207,17 @@
if (!$setting['is_open']) {
return false;
}
- $purchase_count=self::getUserOrderCount($order['user_id']);
- $user=User::detail($order['user_id']);
- if ($user['purchase_count']<=$purchase_count&&$user['purchase_count']!=11){
- return false;
- }
// 获取当前买家的直推奖用户id和业绩奖用户id
$agentUser = $model->getAgentUserId($order, $setting['begin_num']);
// 无分红用户
if (!$agentUser['first_user_id'] && !$agentUser['second_user_id']) {
return false;
}
+ $purchase_count=self::getUserOrderCount($order['user_id']);
+ /*$user=User::detail($order['user_id']);
+ if ($user['purchase_count']<=$purchase_count&&$user['purchase_count']!=11){
+ return false;
+ }*/
// 检查商品是否设置独立分红
$one_money = $setting['one_money'];
$two_money = $setting['two_money'];
@@ -238,7 +237,7 @@
'order_type' => $order_type,
'order_price' => bcsub($order['pay_price'], $order['express_price'], 2),
'first_money' => $agentUser['first_user_id'] > 0 ? $one_money : 0,
- 'second_money' => $agentUser['second_user_id'] > 0 ? $two_money : 0,
+ 'second_money' => $two_money,
'first_user_id' => $one_money > 0 ?$agentUser['first_user_id']:0,
'second_user_id' => $agentUser['second_user_id'],
'subsidy_user_id'=>$agentUser['subsidy_user_id'],
--
Gitblit v1.9.2