From 73b874c72ad55eb9eef21c36160ac0de58f0189e Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 05 Feb 2026 10:30:43 +0800
Subject: [PATCH] 优化名片
---
admin/app/common/model/supplier/Supplier.php | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/admin/app/common/model/supplier/Supplier.php b/admin/app/common/model/supplier/Supplier.php
index e3f684b..e93f2cc 100644
--- a/admin/app/common/model/supplier/Supplier.php
+++ b/admin/app/common/model/supplier/Supplier.php
@@ -7,7 +7,7 @@
use app\common\model\supplier\member\Member as MemberModel;
use app\common\model\supplier\PointsLog as PointsLogModel;
use app\shop\model\auth\UserRole as UserRoleModel;
-
+use app\common\enum\supplier\SupplierType;
/**
* 商家供应商模型
*/
@@ -15,6 +15,8 @@
{
protected $name = 'supplier';
protected $pk = 'shop_supplier_id';
+ protected $append = ['type_text','coordinate'];
+
/**
@@ -60,6 +62,20 @@
{
return $this->hasOne('app\\common\\model\\supplier\\User', 'shop_supplier_id', 'shop_supplier_id')
->where('is_super','=', 1);
+ }
+ /**
+ * 供应商类型文本
+ */
+ public function getTypeTextAttr($value, $data)
+ {
+ return (new SupplierType())::getName(empty($data['supplier_type'])?0:$data['supplier_type']);
+ }
+ public function getCoordinateAttr($value, $data)
+ {
+ if (empty($data['latitude']) || empty($data['longitude'])) {
+ return '';
+ }
+ return $data['latitude'].','.$data['longitude'];
}
/**
* 详情
@@ -145,8 +161,13 @@
{
$model = new static();
+ // 获取用户ID，兼容商户用户和区域代理用户
+ $user_id = isset($user['shop_user_id']) ? $user['shop_user_id'] : (isset($user['region_user_id']) ? $user['region_user_id'] : 0);
+ if (!$user_id) {
+ return [];
+ }
//获取用户所有的角色
- $user_role_ids = (new UserRoleModel())::getRoleIds($user['shop_user_id']);
+ $user_role_ids = (new UserRoleModel())::getRoleIds($user_id);
if(!empty($user_role_ids)){
//获取所有角色的权限
$area_arr =RoleModel::getAreaIdsByRoleIds($user_role_ids);
@@ -188,8 +209,13 @@
*/
public static function getAreaIdsByUser($user)
{
+ // 获取用户ID，兼容商户用户和区域代理用户
+ $user_id = isset($user['shop_user_id']) ? $user['shop_user_id'] : (isset($user['region_user_id']) ? $user['region_user_id'] : 0);
+ if (!$user_id) {
+ return [];
+ }
//获取用户所有的角色
- $user_role_ids = (new UserRoleModel())::getRoleIds($user['shop_user_id']);
+ $user_role_ids = (new UserRoleModel())::getRoleIds($user_id);
if(!empty($user_role_ids)){
//获取所有角色的权限
$area_arr =RoleModel::getAreaIdsByRoleIds($user_role_ids);
--
Gitblit v1.9.2