mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(UserLogic): 修正区域村长选择错误信息

Browse Source
This commit is contained in:
mkm 2024-07-04 10:10:43 +08:00
parent f9f39c2ac0
commit c899642f43
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/user/UserLogic.php
View File

@ -88,7 +88,7 @@ class UserLogic extends BaseLogic
if($arr){ if($arr){
$find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find(); $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
if($find){ if($find){
self::setError('该区域又有村长请重新选择'); self::setError('该区域已有村长请重新选择');
return false; return false;
} }
} }

5
app/store/controller/store_order/StoreOrderController.php
View File

@ -3,6 +3,7 @@
namespace app\store\controller\store_order; namespace app\store\controller\store_order;
use app\admin\logic\user\UserLogic; use app\admin\logic\user\UserLogic;
use app\admin\logic\user_ship\UserShipLogic;
use app\api\logic\order\OrderLogic; use app\api\logic\order\OrderLogic;
use app\api\validate\OrderValidate; use app\api\validate\OrderValidate;
use app\common\model\order\Cart; use app\common\model\order\Cart;
@ -398,6 +399,10 @@ class StoreOrderController extends BaseAdminController
return $this->fail('支付条码不能为空'); return $this->fail('支付条码不能为空');
} }
$params = $this->request->post(); $params = $this->request->post();
UserShipLogic::user_ship($params);
if(UserShipLogic::hasError()){
return $this->fail(UserShipLogic::getError());
}
$data = [ $data = [
'store_id' => $this->adminInfo['store_id'], 'store_id' => $this->adminInfo['store_id'],
'uid' => $params['uid'], 'uid' => $params['uid'],