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'],