diff --git a/app/Request/v3/StoreIndexRequest.php b/app/Request/v3/StoreIndexRequest.php index b2a7352..e4ad462 100644 --- a/app/Request/v3/StoreIndexRequest.php +++ b/app/Request/v3/StoreIndexRequest.php @@ -16,8 +16,7 @@ class StoreIndexRequest extends BaseFormRequest { return [ 'market_id' => 'required|nonempty|integer', - 'store_id' => 'required|nonempty|integer', - 'user_id' => 'nonempty|integer', + 'store_id' => 'required|nonempty|integer' ]; } diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php index 296e3ab..11127c6 100644 --- a/app/Service/v3/Implementations/FeiePrintService.php +++ b/app/Service/v3/Implementations/FeiePrintService.php @@ -131,13 +131,16 @@ class FeiePrintService implements FeiePrintServiceInterface $orderInfo .= $name; } //商品名长度是否超过一行 - if($nameLength > ($B+$C+$D)){ + $goodsTotal = bcmul($goods->number,$goods->price,2); + $priceLen = mb_strwidth($goods->price); + $totalLen = mb_strwidth($goodsTotal); + if($nameLength > ($B+$C+$D-$priceLen-$totalLen)){ $orderInfo .= '
'; $orderInfo .= str_pad($goods->price,$A+$B+$C,' ',STR_PAD_LEFT); }else{ $orderInfo .= str_pad($goods->price,$C+$B+$A-$length,' ',STR_PAD_LEFT); } - $orderInfo .= str_pad(bcmul($goods->number,$goods->price,2),$D,' ',STR_PAD_LEFT); + $orderInfo .= str_pad($goodsTotal,$D,' ',STR_PAD_LEFT); } /** * 订单商品处理结束