From d7e780a49fa3d28f3fbbd340bacc8b1fe0fba477 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 18 Dec 2025 13:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=91=E5=B8=83=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/UserController.php |  4 +-
 app/common/model/UserOld.php            | 49 +++++++++++++++++++++++++
 app/common/service/PostService.php      | 10 +++++
 app/common/service/UserService.php      | 13 ++++++-
 4 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 app/common/model/UserOld.php

diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php
index b975c0c..360a1b5 100644
--- a/app/admin/controller/UserController.php
+++ b/app/admin/controller/UserController.php
@@ -115,8 +115,8 @@ class UserController extends BaseController
 
         $ossservice = new OssService();
         if(isset($data['avatar']) && !empty($data['avatar']) && strpos($data['avatar'], 'http') === false){
-            //$data['avatar_pull'] = $ossservice->generatePrivateUrl($data['avatar']);
-            $data['avatar_pull'] = '/proxy/ossurl?file='.$data['avatar'];
+            $data['avatar_pull'] = $ossservice->generatePrivateUrl($data['avatar']);
+//            $data['avatar_pull'] = '/proxy/ossurl?file='.$data['avatar'];
         }else{
             $data['avatar_pull'] = $data['avatar'];
         }
diff --git a/app/common/model/UserOld.php b/app/common/model/UserOld.php
new file mode 100644
index 0000000..2f21094
--- /dev/null
+++ b/app/common/model/UserOld.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class UserOld extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'user_old';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'name', 'mobile'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+}
\ No newline at end of file
diff --git a/app/common/service/PostService.php b/app/common/service/PostService.php
index 3e6118f..efcaf97 100644
--- a/app/common/service/PostService.php
+++ b/app/common/service/PostService.php
@@ -5,6 +5,7 @@ namespace app\common\service;
 use app\common\model\PostMedia;
 use app\common\model\Sku;
 use app\common\model\User;
+use app\common\model\UserOld;
 use app\common\validate\PostValidate;
 use app\common\traits\crud\CrudServiceTrait;
 use app\common\model\Post;
@@ -120,6 +121,15 @@ class PostService
         if(empty($user->latitude) || empty($user->longitude) || empty($user->mobile)){
             throw new BusinessException('请补全个人中心的门店位置及电话');
         }
+        if(empty($user->is_release)){
+            $UserOld = UserOld::where('mobile', $user->mobile)->first();
+            if(!empty($UserOld)){
+                $user->is_release = 1;
+                $user->save();
+            }else{
+                throw new BusinessException('请联系管理员申请发布权限');
+            }
+        }
         $data['status'] = 1;
         $data['latitude'] = $user->latitude;
         $data['longitude'] = $user->longitude;
diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php
index bc71c82..4274403 100644
--- a/app/common/service/UserService.php
+++ b/app/common/service/UserService.php
@@ -3,6 +3,7 @@
 namespace app\common\service;
 
 use app\common\logic\AuthLogic;
+use app\common\model\UserOld;
 use app\common\validate\UserValidate;
 use app\common\traits\crud\CrudServiceTrait;
 use app\common\model\User;
@@ -256,7 +257,8 @@ class UserService
          $wxinfo = $wechatService->xcxOpenid($data['code']);
          Log::info('wxinfo',[$wxinfo]);
 
-         $name = '微信用户_' . self::generate(8);
+        $sn =  self::generate(8);
+        $name = '微信用户_' . $sn;
         // 用户信息
         $user = User::firstOrCreate(
             ['openid' => $wxinfo['openid']],
@@ -264,6 +266,7 @@ class UserService
                 'nickname' => $name,
                 //'unionid' => $wxinfo['unionid'],
                 'name' => $name,
+                'sn' => $sn,
                 'avatar' => 'bsh_datax/user/20251021/a4ee815405a1506abeec1af0f738f70f_68f6e76514b66.jpg'
             ]
         );
@@ -287,8 +290,14 @@ class UserService
         $wechatService = new WechatService();
         $wxinfo = $wechatService->xcxPhoneNumber($data['phone_code']);
 
+        $mobile = $wxinfo['phone_info']['phoneNumber'];
+        $old = UserOld::where('mobile', $mobile)->first();
         $uinfo = User::where('id', $request->user->uid)->first();
-        $uinfo->mobile = $wxinfo['phone_info']['phoneNumber'];
+        if ($old) {
+            $uinfo->name = $old->name;
+            $uinfo->is_release = 1;
+        }
+        $uinfo->mobile = $mobile;
         $uinfo->save();
 
         return $wxinfo;