From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次，在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访
---
admin/app/branch/model/member/Member.php | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/admin/app/branch/model/member/Member.php b/admin/app/branch/model/member/Member.php
index 228addf..d363194 100644
--- a/admin/app/branch/model/member/Member.php
+++ b/admin/app/branch/model/member/Member.php
@@ -19,10 +19,11 @@
{
// 构建查询规则
$model = $this->alias('A')
- ->field('A.*, user.nickName, user.avatarUrl, user.real_name, user.mobile, branch_position.weight, branch_position.name as position_name')
+ ->field('A.*, user.nickName, user.avatarUrl, user.real_name, user.mobile, branch_position.weight, branch_position.name as position_name, supplier.name as supplier_name')
->with(['branch'])
->join('user', 'user.user_id = A.user_id', 'left')
->join('branch_position', 'branch_position.position_id = A.position_id', 'left')
+ ->join('supplier', 'supplier.shop_supplier_id = A.shop_supplier_id', 'left')
->where('A.is_delete', '=', 0)
->order(['branch_position.weight' => 'desc', 'A.create_time' => 'desc']);
// 查询条件
@@ -44,6 +45,11 @@
*/
public function add($data)
{
+ $user_id = $data['user_id'];
+ if (MemberModel::detail($data['user_id'])) {
+ $this->error = '该用户已经是连盟成员，不能重复添加';
+ return false;
+ }
$data['app_id'] = self::$app_id;
$this->save($data);
// 检查真实姓名和电话有没有更改
@@ -54,6 +60,9 @@
}
if ($user['mobile'] != $data['mobile']) {
$userData['mobile'] = $data['mobile'];
+ }
+ if (!empty($data['avatarUrl'])) {
+ $userData['avatarUrl'] = $data['avatarUrl'];
}
if ($userData) {
$user->save($userData);
@@ -68,7 +77,22 @@
*/
public function edit($data)
{
- return $this->save($data) !== false;
+ $this->save($data);
+ $userData = [];
+ $user = UserModel::detail($data['user_id']);
+ if ($user['real_name'] != $data['real_name']) {
+ $userData['real_name'] = $data['real_name'];
+ }
+ if ($user['mobile'] != $data['mobile']) {
+ $userData['mobile'] = $data['mobile'];
+ }
+ if (!empty($data['avatarUrl']) && $data['avatarUrl'] != $user['avatarUrl']) {
+ $userData['avatarUrl'] = $data['avatarUrl'];
+ }
+ if ($userData) {
+ $user->save($userData);
+ }
+ return true;
}
/**
--
Gitblit v1.9.2