From 3bfbd5c0c1a7112f46b7b539e1f78b063312c9f9 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Wed, 26 Aug 2020 22:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E6=85=A2=E8=AE=A1=E7=AE=971%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/Settlements.php |  4 +---
 hyhproject/common/model/SysSummary.php  | 10 ++++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php
index 7c0743d..caf6643 100755
--- a/hyhproject/common/model/Settlements.php
+++ b/hyhproject/common/model/Settlements.php
@@ -26,9 +26,7 @@ class Settlements extends Base
         }
         $discountMoney = round($discountMoney,2);
         //加入快代付值
-        $fastScale = dataConf('fastPayInSaleScale');
-        $fastNum = round($discountMoney * ($fastScale*0.01),5);
-        Model('SysSummary')->addToPayFast($orderId,$fastNum,$fastScale,'订单【'.($order['orderNo']?:'--').'】优惠款加入');
+        Model('SysSummary')->addToPayFast($orderId,$discountMoney,'订单【'.($order['orderNo']?:'--').'】优惠款加入');
         //获取产品额
         $totalMoney = $order->realTotalMoney;//产品额
         if(2 != $order->goodsType){//助微吧商品不给购户券值
diff --git a/hyhproject/common/model/SysSummary.php b/hyhproject/common/model/SysSummary.php
index 427c283..7892b7f 100755
--- a/hyhproject/common/model/SysSummary.php
+++ b/hyhproject/common/model/SysSummary.php
@@ -6,15 +6,21 @@ use think\Db;
  * 系统数据
  */
 class SysSummary extends Base{
-    public function addToPayFast($orderId,$payFastNum,$fastScale,$sm=''){
+    public function addToPayFast($orderId,$money,$sm=''){
+        $fastScale = dataConf('fastPayInSaleScale');
+        $slowScale = dataConf('slowPayInSaleScale');
+        $payFastNum = round($money * ($fastScale*0.01),5);
+        $paySlowNum = round($money * ($slowScale*0.01),5);
     	$noticeData['orderId'] = $orderId;
     	$noticeData['toPayFast'] = $payFastNum;
     	$noticeData['fastScale'] = $fastScale;
+    	$noticeData['slowScale'] = $slowScale;
+    	$noticeData['desc'] = $sm;
     	$noticeData['createTime'] = time();
     	Db::name('sys_notice')->insert($noticeData);
     	//   原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
         // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
-        $this->addSysSummary($payFastNum, 0, 1,$sm);
+        $this->addSysSummary($payFastNum, $paySlowNum, 1,$sm);
     }
     /**
      * 添加系统数据