|
|
@@ -329,13 +329,14 @@ class StoreOrder extends BaseModel
|
|
|
$cartInfoGainIntegral = isset($cart['productInfo']['give_integral']) ? bcmul($cart['cart_num'], $cart['productInfo']['give_integral'], 2) : 0;
|
|
|
$gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
|
|
|
@file_put_contents('quanju.txt',$is_wholesale."-是否是批发商品\r\n",8);
|
|
|
- $is_wholesale = intval($cart['productInfo']['is_wholesale']);
|
|
|
+
|
|
|
if ($is_wholesale < 3){
|
|
|
@file_put_contents('quanju.txt',$is_wholesale."-是否是批发商品2\r\n",8);
|
|
|
if ($is_wholesale != intval($cart['productInfo']['is_wholesale']) ){
|
|
|
return self::setErrorInfo('批发商品和普通商品不能混合购买!', true);
|
|
|
}
|
|
|
}
|
|
|
+ $is_wholesale = intval($cart['productInfo']['is_wholesale']);
|
|
|
}
|
|
|
$deduction = $seckill_id || $bargain_id || $combinationId;
|
|
|
if ($deduction) {
|
