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/common/model/branch/Member.php | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/admin/app/common/model/branch/Member.php b/admin/app/common/model/branch/Member.php
index 1ba5f6e..423a35f 100644
--- a/admin/app/common/model/branch/Member.php
+++ b/admin/app/common/model/branch/Member.php
@@ -5,6 +5,7 @@
use app\common\model\BaseModel;
use app\common\model\user\User as UserModel;
use app\common\model\branch\Branch as BranchModel;
+use app\common\model\settings\Region;
/**
* 连盟成员模型
@@ -13,6 +14,12 @@
{
protected $name = 'branch_member';
protected $pk = 'user_id';
+
+ /**
+ * 追加字段
+ * @var string[]
+ */
+ protected $append = ['region'];
/**
* 关联所属分会表
@@ -37,6 +44,32 @@
public function user()
{
return $this->belongsTo('app\\common\\model\\user\\User');
+ }
+
+ /**
+ * 关联职务
+ */
+ public function position()
+ {
+ return $this->belongsTo('app\\common\\model\\branch\\Position', 'position_id', 'position_id');
+ }
+
+ /**
+ * 籍贯
+ * @param $value
+ * @param $data
+ * @return array
+ */
+ public function getRegionAttr($value, $data)
+ {
+ if (!isset($data['province_id'])) {
+ return false;
+ }
+ return [
+ 'province' => Region::getNameById($data['province_id']),
+ 'city' => Region::getNameById($data['city_id']),
+ 'region' => $data['region_id'] == 0 ? '' : Region::getNameById($data['region_id']),
+ ];
}
/**
@@ -74,6 +107,10 @@
*/
public function add($data)
{
+ if (self::isMember($data['user_id'])) {
+ $this->error = '该用户已入会';
+ return false;
+ }
$data['app_id'] = self::$app_id;
$this->save($data);
// 更新分会人数
@@ -87,6 +124,33 @@
if ($user['mobile'] != $data['mobile']) {
$userData['mobile'] = $data['mobile'];
}
+ if ($user['avatarUrl'] != $data['avatarUrl']) {
+ $userData['avatarUrl'] = $data['avatarUrl'];
+ }
+ if ($userData) {
+ $user->save($userData);
+ }
+ return true;
+ }
+
+ /**
+ * 修改记录
+ */
+ public function edit($data)
+ {
+ $this->save($data);
+ // 检查真实姓名和电话有没有更改
+ $user = UserModel::detail($this['user_id']);
+ $userData = [];
+ if ($user['real_name'] != $data['real_name']) {
+ $userData['real_name'] = $data['real_name'];
+ }
+ if ($user['mobile'] != $data['mobile']) {
+ $userData['mobile'] = $data['mobile'];
+ }
+ if ($user['avatarUrl'] != $data['avatarUrl']) {
+ $userData['avatarUrl'] = $data['avatarUrl'];
+ }
if ($userData) {
$user->save($userData);
}
--
Gitblit v1.9.2