|
@@ -313,6 +313,14 @@ class StoreOrder extends BaseModel
|
|
|
if (!$test && !$addressId) return self::setErrorInfo('请选择收货地址!', true);
|
|
|
if (!$test && (!UserAddress::be(['uid' => $uid, 'id' => $addressId, 'is_del' => 0]) || !($addressInfo = UserAddress::find($addressId))))
|
|
|
return self::setErrorInfo('地址选择有误!', true);
|
|
|
+ if (!$storeId && !$test) {
|
|
|
+ return self::setErrorInfo('请选择配送门店!', true);
|
|
|
+ }
|
|
|
+ $store = SystemStore::verificWhere()->where('id', $storeId)->find();
|
|
|
+ if (!$store) {
|
|
|
+ return self::setErrorInfo('门店错误!', true);
|
|
|
+ }
|
|
|
+ if (getDistance($addr['latitude'], $addr['longitude'], $store['latitude'], $store['longitude']) / 1000 > $store['radius']) return self::setErrorInfo('地址在派送范围外!', true);
|
|
|
} else {
|
|
|
if ((!$real_name || !$phone) && !$test) return self::setErrorInfo('请填写姓名和电话', true);
|
|
|
$addressInfo['real_name'] = $real_name;
|