From f2c1f6f6e9fe96719ca6659e08ba15a4d00b89a9 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Sun, 5 Jul 2020 14:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php
index a4d27be..817b405 100755
--- a/hyhproject/common/model/Settlements.php
+++ b/hyhproject/common/model/Settlements.php
@@ -28,7 +28,7 @@ class Settlements extends Base
         //加入快代付值
         $fastScale = dataConf('fastPayInSaleScale');
         $fastNum = round($discountMoney * ($fastScale*0.01),5);
-        Model('SysSummary')->addToPayFast($orderId,$fastNum,$fastScale,'订单ID['.$orderId.']优惠款加入代快(即时)');
+        Model('SysSummary')->addToPayFast($orderId,$fastNum,$fastScale,'订单ID['.$orderId.']优惠款加入代快(确认收货)');
         //获取产品额
         $totalMoney = $order->realTotalMoney;//产品额
         if(2 != $order->goodsType){//助微吧商品不给购户券值
diff --git a/hyhproject/common/model/SysSummary.php b/hyhproject/common/model/SysSummary.php
index eefb2de..64855d5 100755
--- a/hyhproject/common/model/SysSummary.php
+++ b/hyhproject/common/model/SysSummary.php
@@ -14,7 +14,7 @@ class SysSummary extends Base{
     	Db::name('sys_notice')->insert($noticeData);
     	//   原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
         // 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
-        $this->addSysSummary($payFastNum, 0,$sm);
+        $this->addSysSummary($payFastNum, 0, 1,$sm);
     }
     /**
      * 添加系统数据