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