更改预期送达时间为unix时间戳格式

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(pData->delivery_time);
+               .arg(QDateTime::fromTime_t(pData->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
 
        str_list.append(print);
     }

fmTakeaway/Control/flowControl.cpp

@@ -268,7 +268,7 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
 
             QString remark(orderObject->remark), deliveryTime;
             remark = remark.isEmpty()? "" : QString("\r\n[备注: %1]").arg(remark);
-            deliveryTime = QString("\r\n[期望送达时间: %1]").arg(orderObject->delivery_time);
+            deliveryTime = QString("\r\n[期望送达时间: %1]").arg(QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
             emit showAlert(AlertForm::SUCCESS, QString("接单成功!%1%2%3").arg(remark).arg(deliveryTime).arg(orderEntryError));
 
             // 通知主界面移动订单

fmTakeaway/Model/orderObject.cpp

@@ -320,12 +320,12 @@ void OrderObject::setstatus_desc(const QString &v)
     status_desc = v;
 }
 
-QString OrderObject::getdelivery_time() const
+int OrderObject::getdelivery_time() const
 {
     return delivery_time;
 }
 
-void OrderObject::setdelivery_time(const QString &v)
+void OrderObject::setdelivery_time(const int &v)
 {
     delivery_time = v;
 }

fmTakeaway/Model/orderObject.h

@@ -48,7 +48,7 @@ public:
     Q_PROPERTY (QString courier_name READ getcourier_name WRITE setcourier_name)
     Q_PROPERTY (QString courier_phone READ getcourier_phone WRITE setcourier_phone)
     Q_PROPERTY (QString status_desc READ getstatus_desc WRITE setstatus_desc)
-    Q_PROPERTY (QString delivery_time READ getdelivery_time WRITE setdelivery_time)
+    Q_PROPERTY (int delivery_time READ getdelivery_time WRITE setdelivery_time)
     Q_PROPERTY (int delivery_status READ getdelivery_status WRITE setdelivery_status)
     Q_PROPERTY (QString fm_id READ getfm_id WRITE setfm_id)
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
@@ -63,7 +63,7 @@ public:
     int channelNum;          //渠道当天序号
     int create_time;         //订单时间
     QString delivery_party;  //派送方式
-    QString delivery_time;   //期望送达时间
+    int delivery_time;   //期望送达时间
     int delivery_status;     //配送状态
     int discount_fee;        //商品优惠
     int expire_time;         //订单倒计时
@@ -153,8 +153,8 @@ protected:
     void setcourier_phone(const QString& v);
     QString getstatus_desc() const;
     void setstatus_desc(const QString& v);
-    QString getdelivery_time() const;
-    void setdelivery_time(const QString& v);
+    int getdelivery_time() const;
+    void setdelivery_time(const int& v);
     QString getfm_id() const;
     void setfm_id(const QString& v);
     int getdelivery_status() const ;

fmTakeaway/Network/billSocket.cpp

@@ -48,7 +48,6 @@ 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,7 @@ 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(orderObject->delivery_time);
+    ui->detailLab5->setText(QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
     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));