1

app/models/store/StoreOrder.php

@@ -288,7 +288,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($uid);
             if (!$userInfo) return self::setErrorInfo('用户不存在!', true);
             $cartGroup = self::getCacheOrderInfo($uid, $key);
-            @file_put_contents('cart.txt', json_encode($cartGroup) . "-购物车内容\r\n", 8);
+//            @file_put_contents('cart.txt', json_encode($cartGroup) . "-购物车内容\r\n", 8);
             if (!$cartGroup) return self::setErrorInfo('订单已过期,请刷新当前页面!', true);
             $cartInfo = $cartGroup['cartInfo'];
             $priceGroup = $cartGroup['priceGroup'];
@@ -381,7 +381,7 @@ class StoreOrder extends BaseModel
                     return self::setErrorInfo('请选择门店', true);
                 }
             }
-            if ($is_type==4||$is_type==5){
+//            if ($is_type==4||$is_type==5){
                 //佣金抵扣
                 $res2 = true;
                 $SurplusIntegral = $userInfo['brokerage_price'];
@@ -417,44 +417,44 @@ class StoreOrder extends BaseModel
                 if (!$res2) return self::setErrorInfo('使用健康币抵扣失败!', true);
                 if ($payPrice <= 0) $payPrice = 0;
 
-            }else{
-                //积分抵扣
-                $res2 = true;
-                $SurplusIntegral = $userInfo['integral'];
-                if ($payIntegral > 0) {
-                    if ($userInfo['integral'] < $payIntegral) {
-                        return self::setErrorInfo('健康豆不足', true);
-                    } else {
-                        $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $payIntegral, 'uid');
-                    }
-                    $SurplusIntegral = bcsub($userInfo['integral'], $payIntegral, 2);
-                    $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '积分');
-                }
-
-                //积分抵扣
-                if ($useIntegral && $SurplusIntegral > 0) {
-                    $deductionPrice = (float)bcmul($SurplusIntegral, $other['integralRatio'], 2);
-                    if ($deductionPrice < $payPrice) {
-                        $payPrice = bcsub($payPrice, $deductionPrice, 2);
-                        $usedIntegral = $SurplusIntegral;
-                        $SurplusIntegral = 0;
-                        $res2 = false !== User::edit(['integral' => 0], $userInfo['uid'], 'uid');
-                    } else {
-                        $deductionPrice = $payPrice;
-                        $usedIntegral = (float)bcdiv($payPrice, $other['integralRatio'], 2);
-                        $SurplusIntegral = bcsub($SurplusIntegral, $usedIntegral, 2);
-                        $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $usedIntegral, 'uid');
-                        $payPrice = 0;
-                    }
-                    $res2 = $res2 && false != UserBill::expend('积分抵扣', $uid, 'integral', 'deduction', $usedIntegral, $key, $SurplusIntegral, '购买商品使用' . floatval($usedIntegral) . '积分抵扣' . floatval($deductionPrice) . '元');
-                } else {
-                    $deductionPrice = 0;
-                    $usedIntegral = 0;
-                }
-                if (!$res2) return self::setErrorInfo('使用积分抵扣失败!', true);
-                if ($payPrice <= 0) $payPrice = 0;
-
-            }
+//            }else{
+//                //积分抵扣
+//                $res2 = true;
+//                $SurplusIntegral = $userInfo['integral'];
+//                if ($payIntegral > 0) {
+//                    if ($userInfo['integral'] < $payIntegral) {
+//                        return self::setErrorInfo('健康豆不足', true);
+//                    } else {
+//                        $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $payIntegral, 'uid');
+//                    }
+//                    $SurplusIntegral = bcsub($userInfo['integral'], $payIntegral, 2);
+//                    $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '积分');
+//                }
+//
+//                //积分抵扣
+//                if ($useIntegral && $SurplusIntegral > 0) {
+//                    $deductionPrice = (float)bcmul($SurplusIntegral, $other['integralRatio'], 2);
+//                    if ($deductionPrice < $payPrice) {
+//                        $payPrice = bcsub($payPrice, $deductionPrice, 2);
+//                        $usedIntegral = $SurplusIntegral;
+//                        $SurplusIntegral = 0;
+//                        $res2 = false !== User::edit(['integral' => 0], $userInfo['uid'], 'uid');
+//                    } else {
+//                        $deductionPrice = $payPrice;
+//                        $usedIntegral = (float)bcdiv($payPrice, $other['integralRatio'], 2);
+//                        $SurplusIntegral = bcsub($SurplusIntegral, $usedIntegral, 2);
+//                        $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $usedIntegral, 'uid');
+//                        $payPrice = 0;
+//                    }
+//                    $res2 = $res2 && false != UserBill::expend('积分抵扣', $uid, 'integral', 'deduction', $usedIntegral, $key, $SurplusIntegral, '购买商品使用' . floatval($usedIntegral) . '积分抵扣' . floatval($deductionPrice) . '元');
+//                } else {
+//                    $deductionPrice = 0;
+//                    $usedIntegral = 0;
+//                }
+//                if (!$res2) return self::setErrorInfo('使用积分抵扣失败!', true);
+//                if ($payPrice <= 0) $payPrice = 0;
+//
+//            }
             @file_put_contents('quanju.txt', $deductionPrice . "-抵扣金额\r\n", 8);
 
             if ($test) {