提交

application/api/controller/Common.php

@@ -133,7 +133,6 @@ class Common extends Base
 //        $this->pdf->lastPage();
         //D是下载，I是在线写入
         $this->pdf->Output($fileName, 'F');
-
     }
 
     /**

application/common/service/ApproveInfoService.php

@@ -438,7 +438,7 @@ class ApproveInfoService
                                     $freeze_stock = array_key_exists($val['id'],$old_goods_freeze_stock_data) ? $old_goods_freeze_stock_data[$val['id']]['stock'] : 0;
                                     if ($stock > ($total_stock + $freeze_stock)) {
                                         // 商品规格库存不足
-                                        $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' . '、';
+                                        $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' . "\n";
                                     }
                                     $total_price = bcadd($total_price, $stock * $price, 2);
                                     $goods_stock_data[] = [
@@ -481,7 +481,7 @@ class ApproveInfoService
                                     }
                                 } else {
                                     // 商品库里没有该商品规格
-                                    $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在、';
+                                    $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在'."\n";
                                 }
                             }
 
@@ -508,7 +508,7 @@ class ApproveInfoService
                             }
                         } else {
                             // 商品库里没有该商品
-                            $error_data .= $value['goods_name'] . '商品库不存在、';
+                            $error_data .= $value['goods_name'] . '商品库不存在'."\n";
                         }
                     }
                     if ($error_data) {
@@ -569,7 +569,7 @@ class ApproveInfoService
                             $price = isset($val['price']) && $val['price'] > 0 ? $val['price'] : 0;
                             if ($stock > $total_stock) {
                                 // 商品规格库存不足
-                                $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' . '、';
+                                $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' ."\n";
                             }
                             $total_price = bcadd($total_price, $stock * $price, 2);
                             $goods_stock_data[] = [
@@ -581,7 +581,7 @@ class ApproveInfoService
                             ];
                         } else {
                             // 商品库里没有该商品规格
-                            $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在、';
+                            $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在'."\n";
                         }
                     }
 
@@ -602,7 +602,7 @@ class ApproveInfoService
                     $total_amount = bcadd($total_amount, $total_price, 2);
                 } else {
                     // 商品库里没有该商品
-                    $error_data .= $value['goods_name'] . '商品库不存在、';
+                    $error_data .= $value['goods_name'] . '商品库不存在'."\n";
                 }
             }
             if ($error_data) {