From ae973ff242bc6cc11dcb0292747d43f31558af49 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Mon, 13 Jul 2020 22:06:57 +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 | 2 +-
hyhproject/common/model/Settlements.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index fcf067c..b1a34b9 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -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,'订单【'.$order['orderNo'].'】被助购转换所扣');
+ $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 23fecd9..d3f0cf4 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,'订单【'.$order['orderNo'].'】优惠款加入');
+ Model('SysSummary')->addToPayFast($orderId,$fastNum,$fastScale,'订单【'.$order['orderNo']?:'--'.'】优惠款加入');
//获取产品额
$totalMoney = $order->realTotalMoney;//产品额
if(2 != $order->goodsType){//助微吧商品不给购户券值