From aec5856ba837c2f0dbb9afc5fea45b6b41bb3953 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 11 Dec 2020 10:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/UserVouchers.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index b2b4081..35b5d61 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -13,12 +13,10 @@ class UserVouchers extends Base{
     	$sysData= $sm->getInfo('toPayFast,toPaySlow');
     	//获取代快付值
 		$toPayFast = $sysData['toPayFast'];
-		$HistoryToPayFast = $sysData['toPayFast'];
 		//今日代快付释放值
 		$payFast = round($toPayFast * (dataConf('fastPayDayScale')*0.01),5);
 		//获取代慢付值
 		$toPaySlow = $sysData['toPaySlow'];
-        $HistoryToPaySlow = $sysData['toPaySlow'];
         $m = Model('common/Table');
         $m->setTable('user_vouchers_summary');
         $HistoryVouchersSummarySum = $m->getSum(['isDisabled'=>0],'expectedProductNum+expectedCouponsNum');
@@ -60,6 +58,7 @@ class UserVouchers extends Base{
 			//扣减系统释放值
             if ($paySlow < 0) $paySlow = 0;
             if ($payFast < 0) $payFast = 0;
+            $minusSysNum = $payFast+$paySlow;
 			$sm->addSysSummary($payFast,$paySlow,2,'扣减系统释放值');
 			//取最小值作为总释放额
 			$payNum = min($maxPayNum,$toPaySum);
@@ -166,10 +165,8 @@ class UserVouchers extends Base{
             $m = Model('common/Table');
             $m->setTable('user_vouchers_summary');
             $vouchersSummarySum = $m->getSum(['isDisabled'=>0],'expectedProductNum+expectedCouponsNum');
-            $deltaFast = $HistoryToPayFast - $toPayFast;
-            $deltaSlow = $HistoryToPaySlow - $toPaySlow;
             $deltaConv = $HistoryVouchersSummarySum - $vouchersSummarySum;
-            $unConv = $deltaFast + $deltaSlow - $deltaConv;
+            $unConv = $minusSysNum - $deltaConv;
             if ($unConv > 0) $sm->addSysSummary(0, $unConv, 1, "加入系统未转换值");
             return WSTReturn("ok", 1);
 		}catch (\Exception $e) {