修复预送达时间显示

fmPrinter/fmPrinter.cpp

@@ -76,7 +76,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
                .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(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"));
 
        str_list.append(print);
     }

fmTakeaway/Network/billSocket.cpp

@@ -48,6 +48,7 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
        return false;
    }
    recvJson = QJsonDocument::fromJson(recvArray).object();
+   qDebug() << recvJson;
    reply->deleteLater();
 
    return true;

fmTakeaway/detailForm.cpp

@@ -45,7 +45,9 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab3->setText(orderObject->address);
     ui->detailLab4->setText(QString("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
                                                                  Penny2Dollar(orderObject->send_fee)));
-    ui->detailLab5->setText(QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
+    QString deliverTime;
+    deliverTime = orderObject->delivery_time==0? "立即送出":QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss");
+    ui->detailLab5->setText(deliverTime);
     ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? "暂未指定" : QString("[姓名]%1 [电话]%2")
                                                                             .arg(orderObject->courier_name, orderObject->courier_phone));
     ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));