Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
fe1aecaf87
@ -49,7 +49,7 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|||||||
$latitude = $this->request->get('latitude','');
|
$latitude = $this->request->get('latitude','');
|
||||||
$longitude = $this->request->get('longitude','');
|
$longitude = $this->request->get('longitude','');
|
||||||
if(empty($longitude) || empty($latitude)){
|
if(empty($longitude) || empty($latitude)){
|
||||||
throw new MyBusinessException('缺失经纬度');
|
throw new Exception('缺失经纬度');
|
||||||
}
|
}
|
||||||
$where[]=['is_show','=',YesNoEnum::YES];
|
$where[]=['is_show','=',YesNoEnum::YES];
|
||||||
$data = SystemStore::where($this->searchWhere)->where($where)
|
$data = SystemStore::where($this->searchWhere)->where($where)
|
||||||
|
@ -124,6 +124,30 @@ class StoreOrderController extends BaseAdminController
|
|||||||
return $this->data($res);
|
return $this->data($res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function checkSms()
|
||||||
|
{
|
||||||
|
$params = (new StoreOrderValidate())->post()->goCheck('check');
|
||||||
|
|
||||||
|
$params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id,用于判断是否是当前店铺的订单
|
||||||
|
$user= User::where('id',$params['uid'])->find();
|
||||||
|
if(empty($user)){
|
||||||
|
return $this->fail('无该用户请检查');
|
||||||
|
}
|
||||||
|
$order = StoreOrderLogic::cartIdByOrderInfo($params['cart_id'], null, $user, $params);
|
||||||
|
if($order['order']['pay_price'] > $user['purchase_funds']){
|
||||||
|
return $this->fail('当前用户采购款不足支付');
|
||||||
|
}
|
||||||
|
$res = (new StoreOrderLogic())->dealSendSms($params);
|
||||||
|
if($res){
|
||||||
|
return $this->success('发送成功',[],1,1);
|
||||||
|
}else{
|
||||||
|
return $this->fail('发送失败');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function createOrder()
|
public function createOrder()
|
||||||
{
|
{
|
||||||
$cartId = (array)$this->request->post('cart_id', []);
|
$cartId = (array)$this->request->post('cart_id', []);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user