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) {