From 350b5f8aaf704eb9b85bb93c255fe2f7b93f494f Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 2 Dec 2020 10:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=BD=AC=E6=8D=A2=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/SysSummary.php   | 2 --
 hyhproject/common/model/UserVouchers.php | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hyhproject/common/model/SysSummary.php b/hyhproject/common/model/SysSummary.php
index 0b1dda2..08ac1a9 100755
--- a/hyhproject/common/model/SysSummary.php
+++ b/hyhproject/common/model/SysSummary.php
@@ -19,8 +19,6 @@ class SysSummary extends Base{
     	$noticeData['desc'] = $sm;
     	$noticeData['createTime'] = time();
     	Db::name('sys_notice')->insert($noticeData);
-    	//   原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
-        // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
         $this->addSysSummary($payFastNum, $paySlowNum, 1,$sm);
     }
     /**
diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php
index f149796..8f5fad5 100755
--- a/hyhproject/common/model/UserVouchers.php
+++ b/hyhproject/common/model/UserVouchers.php
@@ -84,9 +84,11 @@ class UserVouchers extends Base{
     			unset($data);
                 $minNumer = 15;
                 //都小于15不统计，直接加入代慢付
+                //   原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
+                // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
                 if($v['expectedProductNum'] <= $minNumer && $v['expectedCouponsNum'] <= $minNumer){
                     $toSlowNum = round($personNum * ($v['expectedProductNum'] + $v['expectedCouponsNum']),2);
-                    $sm->addSysSummary(0,$toSlowNum,1,'用户ID['.$v['userId'].']双预获券都小于15，直接加入代慢付');
+                    $sm->addSysSummary(0,$toSlowNum,1,'用户ID['.$v['userId'].']双预获券都小于15/日转换退回');
                     continue;
                 }
                 if($v['expectedProductNum'] < $minNumer){//预获产品券小于15;