打印

app-hd/controllers/OrderController.php

@@ -308,13 +308,7 @@ class OrderController extends BaseController
             util::fail('售后付款单不能打印');
         }
         OrderClass::valid($order, $this->mainId);
-        //判断是否快捷开单，快捷开单不显示订花人和送花人
-        $shop = $this->shop;
-        $defaultCustomId = $shop['defaultCustomId'] ?? 0;
-        $customId = $order['customId'] ?? 0;
-        $fastOrder = $defaultCustomId == $customId ? 1 : 0;
-        $params = ['fastOrder' => $fastOrder];
-        OrderClass::onlinePrint($order, true, 'front', $params);
+        OrderClass::onlinePrint($order, true);
         util::complete();
     }
 
@@ -831,7 +825,7 @@ class OrderController extends BaseController
                     $hb->status = 1;
                     $hb->orderId = $id;
                     $hb->save();
-                } else {
+                }else{
                     Yii::error('没有找到红包，hbId: ', $hbId . ' ' . __METHOD__);
                     util::fail('没有找到红包，hbId: ' . $hbId);
                 }

biz-hd/order/classes/OrderClass.php

@@ -790,7 +790,7 @@ class OrderClass extends BaseClass
     }
 
     //云打印 ssh 20210709
-    public static function onlinePrint($order, $must = false, $port = 'front', $params = [])
+    public static function onlinePrint($order, $must = false, $port = 'front')
     {
         if (empty($order)) {
             return false;
@@ -809,6 +809,13 @@ class OrderClass extends BaseClass
         }
 
         $shopId = $order->shopId ?? 0;
+        $shop = ShopClass::getById($shopId, true);
+        $sjId = $shop->sjId ?? 0;
+        $sj = SjClass::getById($sjId, true);
+        $sjName = $sj->name ?? '';
+        $shopName = $shop->shopName ?? '';
+        $currentName = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
+
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
         $printSn = $ext['printSn'] ?? '';
         if ($port == 'make') {
@@ -891,9 +898,10 @@ class OrderClass extends BaseClass
                 $content .= '<B>' . $currentReachDate . ' ' . $readPeriod . '前</B><BR><BR>';
             }
         }
-        $fastOrder = $params['fastOrder'] ?? 0;
+        $defaultCustomId = $shop->defaultCustomId ?? 0;
+        $fastOrder = $defaultCustomId == $customId ? 1 : 0;
         //快捷开单不需要显示这些东西
-        if($fastOrder == 0){
+        if ($fastOrder == 0) {
             if (!empty($order->receiveUserName)) {
                 $content .= '收花人：<BR>';
                 $content .= '<B>' . $order->receiveUserName . '</B><BR>';
@@ -992,13 +1000,6 @@ class OrderClass extends BaseClass
             $content .= '<B>待付尾款：' . floatval($order->remainDebtPrice) . '</B><BR>';
         }
 
-        $shop = ShopClass::getById($shopId, true);
-        $sjId = $shop->sjId ?? 0;
-        $sj = SjClass::getById($sjId, true);
-        $sjName = $sj->name ?? '';
-        $shopName = $shop->shopName ?? '';
-        $currentName = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
-
         $content .= '--------------------------------<BR>';
         $content .= '订单日期：' . $order->addTime . '<BR>';
         $content .= '订单编号：' . $respond['orderSn'] . '<BR>';