Merge branch 'master' into zhongqi-birthDay

biz-ghs/order/classes/OrderClass.php

@@ -1602,8 +1602,11 @@ class OrderClass extends BaseClass
         } else {
             $show = $lastNum . $unitName . ' ' . $name;
         }
-
-        $content .= '<B>' . $show . '</B><BR>';
+        if ($fontSizeType == 1) {
+            $content .= '<L>' . $show . '</L><BR>';
+        } else {
+            $content .= '<B>' . $show . '</B><BR>';
+        }
         if ($refundNum > 0) {
             $content .= '(买' . $itemNum . $unitName . ' 退' . $refundNum . $unitName . ')<BR>';
         }
@@ -1945,6 +1948,12 @@ class OrderClass extends BaseClass
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 10536) {
                 $showPrice = 0;
             }
+
+            //东莞我要花 不带价格
+            if (isset($orderInfo->mainId) && $orderInfo->mainId == 2644) {
+                $showPrice = 0;
+            }
+
             //衡阳昕得鲜花批发，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 85744) {
                 if (!empty($orderInfo->customShopAdminId)) {
@@ -2132,7 +2141,11 @@ class OrderClass extends BaseClass
                 //58mm的机器,一行打印16个汉字,32个字母
                 $name = $current['name'] ?? '';
                 $count = $current['count'] ?? '';
-                $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
+                if ($fontSizeType == 1) {
+                    $content .= '<L>'.$name . ' ' . $count . '</L><BR>';
+                } else {
+                    $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
+                }
                 $content .= '--------------------------------<BR>';
             }
         }