From c899642f435c22a7df551f93a32ede95d2b8e96a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 4 Jul 2024 10:10:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserLogic):=20=E4=BF=AE=E6=AD=A3=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=9D=91=E9=95=BF=E9=80=89=E6=8B=A9=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php                        | 2 +-
 app/store/controller/store_order/StoreOrderController.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index e7b04ce36..534da83eb 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -88,7 +88,7 @@ class UserLogic extends BaseLogic
             if($arr){
                 $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
                 if($find){
-                    self::setError('该区域又有村长请重新选择');
+                    self::setError('该区域已有村长请重新选择');
                     return false;
                 }
             }
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index 17e1f8c12..c3fdfe543 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -3,6 +3,7 @@
 namespace app\store\controller\store_order;
 
 use app\admin\logic\user\UserLogic;
+use app\admin\logic\user_ship\UserShipLogic;
 use app\api\logic\order\OrderLogic;
 use app\api\validate\OrderValidate;
 use app\common\model\order\Cart;
@@ -398,6 +399,10 @@ class StoreOrderController extends BaseAdminController
             return $this->fail('支付条码不能为空');
         }
         $params = $this->request->post();
+        UserShipLogic::user_ship($params);
+        if(UserShipLogic::hasError()){
+            return $this->fail(UserShipLogic::getError());
+        }
         $data = [
             'store_id' => $this->adminInfo['store_id'],
             'uid' => $params['uid'],