From e484f0fc705e2f5e1da1cf3b4a3c0b120e378399 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Mon, 13 Jul 2020 21:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 129fc14..fcf067c 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -1511,7 +1511,7 @@ class Orders extends Base{
                         // step 2 商户支付优惠款给平台：10000×0.4=4000
                         // 10.15添加 优惠款 全额进入 代快付值
                         // 20.06.29 优惠款 90%进入 代快付值
-                        $sm->addSysSummary($calBaseNum*0.9,0,1,'助购吧购物,订单号ID['.$orderId.'],优惠款90%进入代快付值');
+//                        $sm->addSysSummary($calBaseNum*0.9,0,1,'助购吧购物,订单号ID['.$orderId.'],优惠款90%进入代快付值');
 
                         $vm = new UserVouchers();
 
@@ -1528,7 +1528,7 @@ class Orders extends Base{
                         if((int)$order["helpUserLevel"]!==0){
                             $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
                                 '预获助购转换所扣', 0);
-                            $sm->addSysSummary($calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),0,2,'订单ID['.$orderId.']:平台送给购户的上N层用户ID['.$order["helpUserId"].']');
+                            $sm->addSysSummary($calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),0,2,'订单【'.$order['orderNo'].'】被助购转换所扣');
                             $vm->insertVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0,
                                 '预获产品券转换所扣',0);
                             $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100), 0,
diff --git a/hyhproject/common/model/Settlements.php b/hyhproject/common/model/Settlements.php
index 817b405..23fecd9 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,'订单【'.$order['orderNo'].'】优惠款加入');
         //获取产品额
         $totalMoney = $order->realTotalMoney;//产品额
         if(2 != $order->goodsType){//助微吧商品不给购户券值