From 1639b5430116f0d5c24f92a730c5950b34e87055 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 3 Jul 2024 14:09:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserLogic):=20=E6=A0=B9=E6=8D=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AD=89=E7=BA=A7=E9=99=90=E5=88=B6=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php           | 18 ++++++++++++++++++
 app/api/controller/store/StoreController.php |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index cac512f80..ef37de50b 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -77,6 +77,24 @@ class UserLogic extends BaseLogic
 
     public static function StoreAdd(array $params)
     {
+        $user_ship=$params['user_ship']??0;
+        if($user_ship==2){
+            $arr=User::where('user_ship',$user_ship)->column('id');
+            if($arr){
+                $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
+                if($find){
+                    self::setError('该区域又有村长请重新选择');
+                }
+            }
+        }elseif($user_ship==3){
+            $arr=User::where('user_ship',$user_ship)->column('id');
+            if($arr){
+                $find=UserAddress::where('uid','in',$arr)->where('brigade',$params['brigade'])->find();
+                if($find){
+                    self::setError('该区域已有对长请重新选择');
+                }
+            }
+        }
         $passwordSalt = Config::get('project.unique_identification');
         $password = create_password(123456, $passwordSalt);
         $defaultAvatar = config('project.default_image.admin_avatar');
diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index 61410d882..e7e45fbd9 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -83,15 +83,15 @@ class StoreController extends BaseApiController
         $find=User::where('account|mobile',$params['mobile'])->find();
         if(!$find){
             $params['create_uid']=$this->userId;
-            $find=UserUserLogic::StoreAdd($params);
+            UserUserLogic::StoreAdd($params);
+            if(UserUserLogic::hasError()){
+                return $this->fail(UserUserLogic::getError());
+            }
         }else{
             $find['real_name']=$params['real_name'];
             $find['label_id']=$params['label_id']??0;
             $find->save();
         }
-        if($find === false){
-            return $this->fail(UserUserLogic::getError());
-        }
         if($recharge_type!='INDUSTRYMEMBERS'){
             return $this->success('添加用户成功');
         }