添加打印机

app-ghs/controllers/ShopExtController.php

@@ -22,9 +22,13 @@ class ShopExtController extends BaseController
         $printKey = $get['printKey'] ?? '';
         $print = new printUtil($printSn);
         $shop = $this->shop;
-        $shopName = $shop['shopName'] ?? '';
+        $default = $shop->default ?? 0;
+        $shopName = $shop->shopName ?? '';
+        $sj = $this->sj;
+        $sjName = $sj->name ?? '';
+        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
         if (!empty($printSn) && !empty($printKey)) {
-            $return = $print->addPrint($printKey, $shopName);
+            $return = $print->addPrint($printKey, $name);
             if ($return) {
                 $ext->printSn = $printSn;
                 $ext->printKey = $printKey;