Jelajahi Sumber

一些功能

Kirin 3 tahun lalu
induk
melakukan
51fdf69482
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      app/models/store/StoreOrder.php

+ 2 - 2
app/models/store/StoreOrder.php

@@ -313,11 +313,11 @@ 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) {
+                if (!$storeId && !$test && !$free_check && !$store_order) {
                     return self::setErrorInfo('请选择配送门店!', true);
                 }
                 $store = SystemStore::verificWhere()->where('id', $storeId)->find();
-                if (!$store) {
+                if (!$store && !$free_check && !$store_order) {
                     return self::setErrorInfo('门店错误!', true);
                 }
                 if (getDistance($addr['latitude'], $addr['longitude'], $store['latitude'], $store['longitude']) > $store['radius']) return self::setErrorInfo('地址在派送范围外!', true);