1

app/models/store/StoreOrder.php

@@ -387,17 +387,17 @@ class StoreOrder extends BaseModel
             }
 
             //积分抵扣
-            $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 . '积分');
-            }
+//            $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) {
@@ -423,26 +423,26 @@ class StoreOrder extends BaseModel
 //                $usedIntegral = 0;
 //            }
 //            if (!$res2) return self::setErrorInfo('使用积分抵扣失败!', true);
-            $SurplusBrokerage = $userInfo['integral'];
+            $SurplusIntegral = $userInfo['integral'];
             //奖金抵扣
-            if ($useIntegral && $SurplusBrokerage > 0) {
-                $deductionPrice = (float)bcmul($SurplusBrokerage, $other['integralRatio'], 2);
+            if ($useIntegral && $SurplusIntegral > 0) {
+                $deductionPrice = (float)bcmul($SurplusIntegral, $other['integralRatio'], 2);
                 if ($deductionPrice < $payPrice) {
                     $payPrice = bcsub($payPrice, $deductionPrice, 2);
-                    $usedIntegral = $SurplusBrokerage;
-                    $SurplusBrokerage = 0;
+                    $usedIntegral = $SurplusIntegral;
+                    $SurplusIntegral = 0;
 //                    $res2 = false !== User::edit(['integral' => 0], $userInfo['uid'], 'uid');
                     $res2 = false !== User::edit(['brokerage_price' => 0], $userInfo['uid'], 'uid');
                 } else {
                     $deductionPrice = $payPrice;
                     $usedIntegral = (float)bcdiv($payPrice, $other['integralRatio'], 2);
-                    $SurplusBrokerage = bcsub($SurplusBrokerage, $usedIntegral, 2);
+                    $SurplusIntegral = bcsub($SurplusIntegral, $usedIntegral, 2);
 //                    $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $usedIntegral, 'uid');
                     $res2 = false !== User::bcDec($userInfo['uid'], 'brokerage_price', $usedIntegral, 'uid');
                     $payPrice = 0;
                 }
 //                $res2 = $res2 && false != UserBill::expend('积分抵扣', $uid, 'integral', 'deduction', $usedIntegral, $key, $SurplusBrokerage, '购买商品使用' . floatval($usedIntegral) . '积分抵扣' . floatval($deductionPrice) . '元');
-                $res2 = $res2 && false != UserBill::expend('奖金抵扣', $uid, 'brokerage_price', 'deduction', $usedIntegral, $key, $SurplusBrokerage, '购买商品使用' . floatval($usedIntegral) . '奖金抵扣' . floatval($deductionPrice) . '元');
+                $res2 = $res2 && false != UserBill::expend('奖金抵扣', $uid, 'brokerage_price', 'deduction', $usedIntegral, $key, $SurplusIntegral, '购买商品使用' . floatval($usedIntegral) . '奖金抵扣' . floatval($deductionPrice) . '元');
             } else {
                 $deductionPrice = 0;
                 $usedIntegral = 0;