shish 3 лет назад
Родитель
Сommit
1ff365e9dd
1 измененных файлов с 9 добавлено и 31 удалено
  1. 9 31
      biz-ghs/order/classes/OrderClass.php

+ 9 - 31
biz-ghs/order/classes/OrderClass.php

@@ -910,20 +910,11 @@ class OrderClass extends BaseClass
     {
         //58mm的机器,一行打印16个汉字,32个字母
         $name = $current['name'] ?? '';
-
         $productNum = $current['num'] ?? '';
-        $content .= '<B>' . $name . ' ' . $productNum . '</B><BR>';
-        $blankNum = bcsub(12, strlen($productNum));
-        if ($blankNum > 0) {
-            $productNum = $productNum . str_repeat(' ', $blankNum);
-        }
-
+        $count = $current['count'] ?? '';
+        $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
         $productPrice = $current['price'] ?? '';
-        $blankNum = bcsub(7, strlen($productPrice));
-        if ($blankNum > 0) {
-            $productPrice = $productPrice . str_repeat(' ', $blankNum);
-        }
-        $content .= $productNum . ' ' . $productPrice . '<BR>';
+        $content .= $productNum . '=' . $productPrice . '<BR>';
         return $content;
     }
 
@@ -932,10 +923,6 @@ class OrderClass extends BaseClass
     {
         $showItem = OrderClass::getShowItem(true, $orderInfo);
 
-        $mainId = $orderInfo['mainId'] ?? 0;
-        $staff = ShopAdminClass::getByCondition(['mainId' => $mainId, 'founder' => 2], true);
-        $mobile = $staff->mobile ?? '';
-
         $customId = $orderInfo['customId'] ?? 0;
         $c = CustomClass::getById($customId);
         $debtAmount = $c['debtAmount'] ?? 0.00;
@@ -983,9 +970,7 @@ class OrderClass extends BaseClass
 
         if (isset($respond['product']) && !empty($respond['product'])) {
             foreach ($respond['product'] as $current) {
-
                 $content = self::printGroup($current, $content);
-
             }
             $content .= '--------------------------------<BR>';
         }
@@ -995,21 +980,11 @@ class OrderClass extends BaseClass
             foreach ($respond['refund'] as $current) {
                 //58mm的机器,一行打印16个汉字,32个字母
                 $name = $current['name'] ?? '';
-                $content .= $name . '<BR>';
-                $name = str_repeat(' ', 10);
-
+                $count = $current['count'] ?? '';
+                $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
                 $productNum = $current['num'] ?? '';
-                $blankNum = bcsub(12, strlen($productNum));
-                if ($blankNum > 0) {
-                    $productNum = $productNum . str_repeat(' ', $blankNum);
-                }
-
                 $productPrice = $current['price'] ?? '';
-                $blankNum = bcsub(7, strlen($productPrice));
-                if ($blankNum > 0) {
-                    $productPrice = $productPrice . str_repeat(' ', $blankNum);
-                }
-                $content .= $name . " " . $productNum . ' ' . $productPrice . '<BR>';
+                $content .= $productNum . '=' . $productPrice . '<BR>';
             }
             $content .= '--------------------------------<BR>';
         }
@@ -1130,6 +1105,7 @@ class OrderClass extends BaseClass
                     $printProduct[] = [
                         'name' => $itemVal['name'] ?? '',
                         'num' => floatval($bigNum) . '扎*' . floatval($bigUnitPrice),
+                        'count' => floatval($bigNum) . '扎*',
                         'price' => floatval($bigTotalPrice),
                     ];
                 }
@@ -1138,6 +1114,7 @@ class OrderClass extends BaseClass
                     $printProduct[] = [
                         'name' => $itemVal['name'] ?? '',
                         'num' => floatval($smallNum) . '支*' . floatval($smallUnitPrice),
+                        'count' => floatval($smallNum) . '支*',
                         'price' => floatval($smallTotalPrice),
                     ];
                 }
@@ -1164,6 +1141,7 @@ class OrderClass extends BaseClass
                         $refundList[] = [
                             'name' => $currentRefund['name'] ?? '',
                             'num' => floatval($num) . $unitName . '*' . floatval($unitPrice),
+                            'count' => floatval($num) . $unitName,
                             'price' => floatval($currentPrice),
                         ];
                     }