Fix 1：修复自提订单小票显示送达时间问题

fmPrinter/fmPrinter.cpp

@@ -144,10 +144,30 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
 
 
     QString print;
+
+    QString deliveryStr("..");
+    switch(pData->order_type)
+    {
+    case 1:
+        deliveryStr = "立即送达";
+        break;
+    case 2:
+        deliveryStr = QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm");
+        break;
+    case 3:
+        deliveryStr = "顾客自提";
+        break;
+    case 4:
+        deliveryStr = "堂食";
+        break;
+    }
+
+    if(pData->order_type == 1 )
+
     if(!pData->channelName.compare("饿了么"))
     {
         print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)+" 饿了么").append("|").append(pData->order_type==3?"自提":pData->delivery_party).append("|").append(pData->order_view_id.isEmpty()?pData->order_id:pData->order_view_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
-                .append("|").append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达").append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
+                .append("|").append(deliveryStr).append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
                 .append("|").append(_Penny2Dollar(pData->send_fee)).append("|").append(QString::number(pData->total_amount)).append("|").append(_Penny2Dollar(pData->total_fee-pData->discount_fee)).append("|").append(pData->customer).append("|").append(pData->address).append("|").
                 append(pData->phone);
     }

fmTakeaway/Control/flowControl.cpp

@@ -110,6 +110,9 @@ bool FlowControl::_PullOrder()
 
     QLOG_INFO() << QString("[---pull order---][requestData:%1]").arg(_GetJsonStr(sendJson));
     result = m_pullOrderSocket->Request(sendJson, recvJson, error);
+    qDebug() << "---------------------------------------------------------------";
+    qDebug() << recvJson;
+    qDebug() << "---------------------------------------------------------------";
     QLOG_INFO() << QString("pull order finsh. [result:%1][msg:%2]")
                    .arg(result).arg(error);
     if(!result)
@@ -191,7 +194,7 @@ bool FlowControl::_PullOrder()
                     {
                         Orderstatus::getInstance().statusinsert(orderId,0);
                     }
-                    if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId))
+                    if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId)&&orderObject->order_type!=3)
                     {
                         emit startRemind(0);
                         QLOG_INFO()<<QString("[---begin to tip---]");