diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php
index dfead3f..f721a59 100644
--- a/app/Service/v3/Implementations/FeiePrintService.php
+++ b/app/Service/v3/Implementations/FeiePrintService.php
@@ -124,7 +124,7 @@ class FeiePrintService implements FeiePrintServiceInterface
$goodsTotal = bcmul($goods->number,$goods->price,2);
$priceLen = mb_strwidth($goods->price);
$totalLen = mb_strwidth($goodsTotal);
- if($nameLength > ($B+$C+$D-$priceLen-$totalLen)){
+ if($nameLength >= ($B+$C+$D-$priceLen-$totalLen)){
$orderInfo .= '
';
$orderInfo .= str_pad($goods->price,$A+$B+$C,' ',STR_PAD_LEFT);
}else{
@@ -170,11 +170,13 @@ class FeiePrintService implements FeiePrintServiceInterface
$orderInfo .= str_pad($total,$C+$D+$totalLength+1,' ',STR_PAD_LEFT);
$orderInfo .= '
';
$orderInfo .= '配送方式:' . $arr->shipping_type_text . '
';
- if($arr->shipping_type != Shipping::SELF_TAKING){
+ if($arr->shipping_type != Shipping::TYPE_SELF_TAKE){
$orderInfo .= '送货地点:' . $arr->address . '
';
}
- $tel = substr_replace( $arr->tel, '****', 3, 4);
- $orderInfo .= '联系电话:' . $tel . '
';
+ if(!empty($arr->tel)){
+ $tel = substr_replace( $arr->tel, '****', 3, 4);
+ $orderInfo .= '联系电话:' . $tel . '
';
+ }
$orderInfo .= '下单时间:' . $arr->pay_time_text . '
';
$orderInfo .= '送达时间:' . $arr->delivery_time_note . '
';
//$orderInfo .= 'http://www.feieyun.com';//把解析后的二维码生成的字符串用标签套上即可自动生成二维码