|
@@ -318,7 +318,7 @@ class StoreOrder extends BaseModel
|
|
|
$mer_id = [];
|
|
$mer_id = [];
|
|
|
$totalNum = 0;
|
|
$totalNum = 0;
|
|
|
$gainIntegral = 0;
|
|
$gainIntegral = 0;
|
|
|
- $is_wholesale=-1;
|
|
|
|
|
|
|
+ $is_wholesale=3;
|
|
|
foreach ($cartInfo as $cart) {
|
|
foreach ($cartInfo as $cart) {
|
|
|
$cartIds[] = $cart['id'];
|
|
$cartIds[] = $cart['id'];
|
|
|
$totalNum += $cart['cart_num'];
|
|
$totalNum += $cart['cart_num'];
|
|
@@ -328,9 +328,9 @@ class StoreOrder extends BaseModel
|
|
|
if (!$combinationId) $combinationId = $cart['combination_id'];
|
|
if (!$combinationId) $combinationId = $cart['combination_id'];
|
|
|
$cartInfoGainIntegral = isset($cart['productInfo']['give_integral']) ? bcmul($cart['cart_num'], $cart['productInfo']['give_integral'], 2) : 0;
|
|
$cartInfoGainIntegral = isset($cart['productInfo']['give_integral']) ? bcmul($cart['cart_num'], $cart['productInfo']['give_integral'], 2) : 0;
|
|
|
$gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
|
|
$gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
|
|
|
- $is_wholesale = $cart['productInfo']['is_wholesale'];
|
|
|
|
|
@file_put_contents('quanju.txt',$is_wholesale."-是否是批发商品\r\n",8);
|
|
@file_put_contents('quanju.txt',$is_wholesale."-是否是批发商品\r\n",8);
|
|
|
- if ($is_wholesale!=-1&&$is_wholesale!=$cart['productInfo']['is_wholesale']){
|
|
|
|
|
|
|
+ $is_wholesale = $cart['productInfo']['is_wholesale'];
|
|
|
|
|
+ if ($is_wholesale < 3&&$is_wholesale != $cart['productInfo']['is_wholesale']){
|
|
|
return self::setErrorInfo('批发商品和普通商品不能混合购买!', true);
|
|
return self::setErrorInfo('批发商品和普通商品不能混合购买!', true);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
