diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 995b4c49..7a25c231 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -68,6 +68,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository //虚拟订单自定义数据 $order_extend = []; //检查商品类型, 活动商品只能单独购买 + foreach ($merchantCartList as $merchantCart) { foreach ($merchantCart['list'] as $cart) { if ($cart['product_type']==0) { @@ -83,7 +84,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository throw new ValidateException('[超出限购总数:'. $cart['product']['once_max_count'].']'.mb_substr($cart['product']['store_name'],0,10).'...'); } } - if ($cart['product_type'] > 0) $order_type = $cart['product_type']; if ($cart['product_type']<=97 &&$cart['product_type'] > 0 && (($cart['product_type'] != 10 && count($merchantCart['list']) != 1) || count($merchantCartList) != 1)) { throw new ValidateException('活动商品必须单独购买'); @@ -100,6 +100,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository if ($order_type == 98 && count($merchantCartList) > 1) { throw new ValidateException('采购商品不支持跨店购买'); } + halt($order_type); $community = []; if ($order_type == 98) { $sourceIdArray = []; diff --git a/public/index.html b/public/index.html index 7087543f..2c6cfb2f 100644 --- a/public/index.html +++ b/public/index.html @@ -2,4 +2,4 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') - }