Add 1: 小票新增预订单信息

fmPrinter/fmPrinter.cpp

@@ -80,11 +80,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
            }
        }
 
-       print = str_print.arg(v).arg(QString("%1##%2").arg(pData->channelName).arg(pData->order_index)).arg(pData->order_id).arg(pData->pay_type)
+       print = str_print.arg(v).arg(QString("【%1】##%2").arg(pData->channelName).arg(pData->order_index)).arg(QString("%1 【%2】").arg(pData->order_id).arg(pData->order_type==2?"预订单":"")).arg(pData->pay_type)
                .arg(pData->customer).arg(pData->phone).arg(pData->address.replace("埇","Yong")).arg(str_comd_list)
                .arg(_Penny2Dollar(pData->total_fee-pData->send_fee)).arg(_Penny2Dollar(pData->discount_fee)).arg(_Penny2Dollar(pData->send_fee)).arg(pData->total_amount)
                .arg(fee).arg(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm")).arg(pData->remark).arg(pData->courier_name).arg(pData->courier_phone)
-               .arg(pData->delivery_time==0? "立即送出":QDateTime::fromTime_t(pData->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
+               .arg(pData->delivery_time==0? "立即送出":QDateTime::fromTime_t(pData->delivery_time).toString("yyyy-MM-dd hh:mm:ss")).arg(pData->has_invoiced?"是":"否").arg(pData->invoice_title);
 
        str_list.append(print);
     }

fmTakeaway/Control/flowControl.cpp

@@ -600,8 +600,16 @@ void FlowControl::onProcessOrder(const QString &operation, const QString &orderI
         // 放在这检测收银员的合法性因为接单前会获取配送员
         if(_CheckCashiers())
         {
+            // 平台配送的就不需要获取配送员了
+            if(m_ordersMap.value(orderId)->delivery_type==1)
+            {
+                _ConfirmOrder(orderId, deliverObj);
+            }else
+            {
                 _GetDelivers(orderId);
             }
+        }
+
     }else if(!operation.compare(OPERATION_CONFRIM))
     {
         _ConfirmOrder(orderId, deliverObj);

fmTakeaway/Model/orderObject.cpp

@@ -19,6 +19,16 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+int OrderObject::getorder_type() const
+{
+    return  order_type;
+}
+
+void OrderObject::setorder_type(const int &v)
+{
+    order_type = v;
+}
+
 int OrderObject::getdelivery_type() const
 {
     return delivery_type;

fmTakeaway/Model/orderObject.h

@@ -54,7 +54,7 @@ public:
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
     Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee)
     Q_PROPERTY (int delivery_type READ getdelivery_type WRITE setdelivery_type)
-
+    Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type)
 
     QString address;         //地址
     QString channel;         //渠道
@@ -96,9 +96,14 @@ public:
 
     int delivery_type;      // 配送方式
 
+    int order_type;         // 订单类型1正常单 2预订单
+
 
 protected:
 
+    int getorder_type() const ;
+    void setorder_type(const int& v);
+
     int getdelivery_type() const ;
     void setdelivery_type(const int& v);
 

run/printformat.txt

@@ -19,6 +19,8 @@
 配送员: %16
 电话: %17
 送达时间: %18
+是否开票：%19
+发票抬头: %20
 老乡鸡安徽快餐领先品牌