no message

app/Console/Commands/Test.php

@@ -2,7 +2,9 @@
 
 namespace App\Console\Commands;
 
+use App\Models\ShopPrinter;
 use App\Servers\JobServer;
+use App\Servers\printer\PrinterServer;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
@@ -39,6 +41,12 @@ class Test extends Command
      */
     public function handle()
     {
+//        $printer = ShopPrinter::where('shop_id',111)->where('is_del',0)->get();
+//        foreach ($printer as $value){
+//            $res = PrinterServer::creatServer()->sendPrints($value->{'brand_id'},$value->{'sn'},1);
+//            var_dump($res);
+//        }
+//        dd(111);
         // 投递打印消息
         JobServer::creatServer()->shopOrderPrintJob(1,111);
         return 0;

app/Jobs/PrintOrderJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Models\Order;
 use App\Models\ShopPrinter;
 use App\Servers\printer\PrinterServer;
 use Illuminate\Bus\Queueable;
@@ -35,13 +36,16 @@ class PrintOrderJob implements ShouldQueue
     public function handle()
     {
         $order_id = $this->order_id;
-        var_dump('外卖订单打印消息队列处理',$order_id);
+        var_dump('订单打印消息队列处理',$order_id);
         $shop_id = $this->shop_id;
         //获取商家打印机
         $printer = ShopPrinter::where('shop_id',$shop_id)->where('is_del',0)->get();
         foreach ($printer as $value){
             $res = PrinterServer::creatServer()->sendPrints($value->{'brand_id'},$value->{'sn'},$order_id);
             var_dump($res);
+            if ($res){
+                Order::where('id',$order_id)->where('shop_id',$shop_id)->update(['is_print'=>1]);
+            }
         }
         return true;
     }

app/Servers/OrderServer.php

@@ -65,7 +65,7 @@ class OrderServer
             $shop_money = bcsub($order_money,$service_money,2);
             //信息入库
             $order_info = [
-                'order_sn' => CommonServer::creatServer()->createOrderNo('WDO'),
+                'order_sn' => CommonServer::creatServer()->createOrderNo('382FDC'),
                 'order_type' => $order_type,
                 'm_id' => $m_id,
                 'shop_id' => $shop_id,

app/Servers/printer/NoteFormatterServer.php

@@ -90,7 +90,6 @@ class NoteFormatterServer
         $result = $result . $quantityStr . str_repeat(" ", self::MAX_QUANTITY_CHAR_LEN - $quantityLen);
         $result = $result . $priceStr . str_repeat(" ", self::MAX_PRICE_CHAR_LEN - $priceLen);
 
-//        $result = '<L><HB>'.$result . "</L></HB><BR>";
 
         return $result;
     }

app/Servers/printer/PrinterServer.php

@@ -116,7 +116,7 @@ class PrinterServer
             $order = Order::where('id',$order_id)
                 ->where('is_del',0)
                 ->where('order_status',2)
-                ->select(['id','order_sn','m_id','order_type','number','note','pay_money','goods_number','pack_price','created_at','shop_id'])
+                ->select(['id','order_sn','m_id','order_type','number','note','pay_money','goods_number','pack_price','created_at','shop_id','table_number','diner_number'])
                 ->first();
             if (empty($order)) {
                 ErrorRecord::create(['msg' => '订单不存在打印失败：', 'data' => $order_id]);

app/Servers/printer/SpyunServer.php

@@ -182,11 +182,10 @@ class SpyunServer
         }
         $NoteFormatterServer = NoteFormatterServer::creatServer();
         $content = '<CB>#' . $order->{'number'} .$str.'</CB><BR>';
-        $content .= '<C>桌号：' . $order->{'table_number'} . '<C><BR>';
+        $content .= '<C>桌号：' . $order->{'table_number'} . '</C><BR>';
         $content .= str_repeat('-', 32) . "<BR>";
         //下单时间
 
-        $content .= str_repeat('-', 32) . "<BR>";
         $content .= '下单时间:'.$order->{'created_at'}. '<BR>';
         $content .= '订单编号:'.$order->{'order_sn'}. '<BR>';
         $content .= str_repeat('-', 32) . "<BR>";
@@ -195,6 +194,7 @@ class SpyunServer
             $goods_name = $value->{'goods_name'} . '(' . $value->{'goods_attr'} . ')';
             $content .=  '<H>'.$NoteFormatterServer::formatPrintOrderItem($goods_name, $value->{'goods_number'}, $value->{'goods_price'}). '</H><BR>';
         }
+//        dd($content);
         $content .= '<B>共：' . $order->{'goods_number'} . '件</B><BR>';
         $content .= '<L1>' . '备注:'.$order->{'note'} . '</L1><BR>';
         $content .= str_repeat('-', 32) . '<BR>';