From fadce0e804c2464f2401d292e38677f0dddb43d1 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 15 Nov 2020 00:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9C=AA=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index 75d7710..f149796 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -13,11 +13,16 @@ 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');
+        //今日付慢付释放值
 		$paySlow = round($toPaySlow * (dataConf('slowPayDayScale')*0.01),5);
 		//应释放总额
 		$toPaySum = $payFast + $paySlow;
@@ -153,7 +158,19 @@ class UserVouchers extends Base{
                 }
             }
             Db::commit();
-			return WSTReturn("ok", 1);
+            $sm = Model('common/SysSummary');
+            $sysData= $sm->getInfo('toPayFast,toPaySlow');
+            $toPayFast = $sysData['toPayFast'];
+            $toPaySlow = $sysData['toPaySlow'];
+            $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;
+            if ($unConv > 0) $sm->addSysSummary(0, $unConv, 1, "加入系统未转换值");
+            return WSTReturn("ok", 1);
 		}catch (\Exception $e) {
             dump($e);
             Db::rollback();errLog($e);