fix bug: before try catch

fmTakeout/Control/flowControl.h

@@ -128,6 +128,19 @@ signals:
      * */
     void doHideMainShowFloatFrom();
 
+    /* 功能:通知 锁住 悬浮窗
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void doLockFloatForm();
+
+    /* 功能:通知 解锁 悬浮窗
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void doUnLockFloatFrom();
+
+
     /* 功能:设置主界面门店信息
      * 参数:[1]门店号
      * 返回:NULL
@@ -148,11 +161,13 @@ signals:
      * 返回:NULL
      * */
     void setNetStatus(const QString& status);
+
     /* 功能:更改订单显示表
      * 参数:[1]订单对象[2]旧订单的状态
      * 返回:NULL
      * */
     void changeOrderStatus(OrderObject* orderObject, int oldStatus=-100);
+
     /* 功能:显示订单详情界面
      * 参数:[1]收银员信息
      * 返回:NULL

fmTakeout/DTools/printSumBillPosDB.cpp

@@ -72,12 +72,14 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
     query.addBindValue(orderObj->addressDetail); // --收货者
     query.addBindValue(orderObj->consigneePhone); // --收货者-电话
     query.addBindValue(orderObj->id); // --订单编号
-    query.addBindValue((orderObj->waybillId).length()?orderObj->waybillId:0); // --物流编号
-    query.addBindValue((orderObj->pickupCode).length()?orderObj->pickupCode.toInt():0); // --取餐号；
+    query.addBindValue((orderObj->waybillId).length()?orderObj->waybillId:QString("0") ); // --物流编号
+    query.addBindValue((orderObj->pickupCode).length()?orderObj->pickupCode.toInt():0 ); // --取餐号；
     query.addBindValue(orderObj->riderPhone); // --配送者电话
     query.addBindValue(orderObj->riderName); // -配送者名称
 
-    QLOG_INFO()<<QString("waybillId:%1").arg((orderObj->waybillId).length()?orderObj->waybillId:0);
+    QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill  waybillId length :%1-->>>>]").arg((orderObj->waybillId).length());
+    QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill  waybillId :%1-->>>>]").arg(orderObj->waybillId);
+    QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill  waybillId:%1-->>>>]").arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0"));
 
     if(!query.exec())
     {
@@ -91,7 +93,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
                      .arg(orderObj->lastName).arg(orderObj->customerName).arg(temp_customerSex)
                      .arg(0).arg(qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss")).arg(FlowControl::GetInstance()._GetCashierId()).arg("").arg("")
                      .arg(orderObj->consigneeName).arg(orderObj->addressDetail).arg(orderObj->consigneePhone).arg(orderObj->id)
-                     .arg((orderObj->waybillId).length()?orderObj->waybillId:0).arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()).arg(orderObj->riderPhone).arg(orderObj->riderName);
+                     .arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0")).arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()).arg(orderObj->riderPhone).arg(orderObj->riderName);
     } else {
         QLOG_INFO()<<QString("[<<<<---SqlServer Database:Insert OrderId %1 Into customer_info Success--->>>>]").arg(orderObj->id);
         result = true;

fmTakeout/Model/orderObject.h

@@ -88,10 +88,10 @@ public:
 
     QString id;  //编号
     QString payfmId;  //FM唯一码
-    QString thirdPartyBatch;  //第三方交易流水号
+    QString thirdPartyBatch ;  //第三方交易流水号
     int orderType; //订单类型: 用来区分是 正常订单(1) 预订单(2) 还是 客诉单:3 (星巴克定义客诉单的类型:12);
     QString orgOrderId; //原始订单编号
-    QString waybillId;  //运单号
+    QString waybillId ;  //运单号
     QString watercourseId; //流水号
     QString pickupCode; //取餐号
     QString customerId; //用户编号

fmTakeout/Network/billSocket.cpp

@@ -6,6 +6,7 @@
 #include <QTimer>
 #include <QFile>
 #include <QSslConfiguration>
+#include "QsLog.h"
 
 BillSocket::BillSocket(QObject *parent)
     : QObject(parent)
@@ -22,44 +23,45 @@ BillSocket::~BillSocket()
 bool BillSocket::PostRequest(const QJsonObject &requestJson, QJsonObject &recvJson, QString &error)
 {
     //设置Http请求管理的网络访问权限设置；
-    if(QNetworkAccessManager::Accessible != m_networkManger.networkAccessible())
-    {
+    //QLOG_INFO()<<QString("[<<<PostRequest: request: >>>>]")<< requestJson;
+    if(QNetworkAccessManager::Accessible != m_networkManger.networkAccessible()) {
         m_networkManger.setNetworkAccessible(QNetworkAccessManager::Accessible);
     }
     //设置Http请求的请求参数：requestJson；
     QByteArray sendArray = QJsonDocument(requestJson).toJson(QJsonDocument::Compact);
     QEventLoop eventLoop;
+    //QLOG_INFO()<<QString("[<<<PostRequest: sendArray: >>>>]")<< sendArray;
     QNetworkReply *reply = m_networkManger.post(m_networkRequest , sendArray);
+    //QLOG_INFO()<<QString("[<<<PostRequest: reply : >>>>]")<< reply;
     connect(&m_networkManger, SIGNAL(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)), &eventLoop, SLOT(quit()));
     connect(reply, SIGNAL(finished()), &eventLoop, SLOT(quit()));
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), &eventLoop, SLOT(quit()));
     // 加用定时器防止网络出现异常长时间不返回导致的阻塞
     QTimer::singleShot(VALUE_NETTIMEOUT, &eventLoop, &QEventLoop::quit);
     eventLoop.exec();
+    //QLOG_INFO()<<QString("[<<<PostRequest: jiexi ding dan shuju: >>>>]")<< reply;
 
     //获取Http请求的返回json数据；
-   if(reply->error() != QNetworkReply::NoError)
-   {
+   if(reply->error() != QNetworkReply::NoError) {
+       QLOG_INFO()<<QString("[<<<PostRequest: reply->error(): >>>>]")<< reply->error();
        error = reply->errorString();
        return false;
    }
-
    QByteArray recvArray = reply->readAll();
-   if(recvArray.size() == 0)
-   {
+   //QLOG_INFO()<<QString("[<<<PostRequest: reply->readAll(): >>>>]")<< recvArray;
+   if(recvArray.size() == 0) {
        error = "nothing recved";
        return false;
    }
    recvJson = QJsonDocument::fromJson(recvArray).object();
+   //QLOG_INFO()<<QString("[<<<PostRequest: recvJson: >>>>]")<< recvJson;
    reply->deleteLater();
-
    return true;
 }
 
 bool BillSocket::GetRequest( QJsonObject &recvJson, QString &error)
 {
-    if(QNetworkAccessManager::Accessible != m_networkManger.networkAccessible())
-    {
+    if(QNetworkAccessManager::Accessible != m_networkManger.networkAccessible()) {
         m_networkManger.setNetworkAccessible(QNetworkAccessManager::Accessible);
     }
     QEventLoop eventLoop;
@@ -70,22 +72,17 @@ bool BillSocket::GetRequest( QJsonObject &recvJson, QString &error)
     // 加用定时器防止网络出现异常长时间不返回导致的阻塞
     QTimer::singleShot(VALUE_NETTIMEOUT, &eventLoop, &QEventLoop::quit);
     eventLoop.exec();
-
-   if(reply->error() != QNetworkReply::NoError)
-   {
+   if(reply->error() != QNetworkReply::NoError) {
        error = reply->errorString();
        return false;
    }
-
    QByteArray recvArray = reply->readAll();
-   if(recvArray.size() == 0)
-   {
+   if(recvArray.size() == 0) {
        error = "nothing recved";
        return false;
    }
    recvJson = QJsonDocument::fromJson(recvArray).object();
    reply->deleteLater();
-
    return true;
 }
 
@@ -105,7 +102,6 @@ void BillSocket::SetSslConfig()
     m_sslConfig.setPeerVerifyMode(QSslSocket::VerifyNone);
     m_sslConfig.setProtocol(QSsl::AnyProtocol);
     m_networkRequest.setSslConfiguration(m_sslConfig);
-
     /*
     QSslConfiguration m_sslConfig = QSslConfiguration::defaultConfiguration();
     QString keyDir = QGuiApplication::applicationDirPath() + "/key/";

fmTakeout/detailForm.cpp

@@ -151,9 +151,7 @@ void DetailForm::onOperaBtnClicked()
             QLOG_INFO() << QString("[<<<<---DetailForm::onOperaBtnClicked: --->>>>]")<<m_refuseForm->m_reasonCode<<m_refuseForm->m_reasonStr<<m_refuseForm->m_refundDishesListString;
             emit processRepealOrder( pBtn->property("orderId").toString(),m_refuseForm->m_reasonCode,m_refuseForm->m_reasonStr,m_refuseForm->m_refundDishesListString);
         }
-    }
-    else
-    {
+    } else {
         emit processOrder(pBtn->property("operation").toString(), pBtn->property("orderId").toString());
     }
 }

fmTakeout/floatForm.cpp

@@ -33,7 +33,7 @@ FloatForm::FloatForm(QWidget *parent) :
 }
 
 FloatForm::~FloatForm()
-{
+{       
     delete ui;
 }
 
@@ -182,3 +182,15 @@ void FloatForm::onShow()
     show();
     m_raiseTimer.start();
 }
+
+
+void FloatForm::onLockFloatForm(){
+    QLOG_INFO()<<QString("[<<<----FloatForm::onLockFloatForm : Lock Float Form --->>>>]");
+    this->setEnabled(false);
+}
+
+
+void FloatForm::onUnLockFloatForm(){
+    QLOG_INFO()<<QString("[<<<----FloatForm::onUnLockFloatForm : unLock Float Form --->>>>]");
+    this->setEnabled(true);
+}

fmTakeout/floatForm.h

@@ -92,6 +92,20 @@ public slots:
      * 返回:NULL
      * */
     void onShow();
+
+    /* 功能:锁住窗口:enable(false);
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void onLockFloatForm();
+
+    /* 功能:解锁窗口:enable(true);
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void onUnLockFloatForm();
+
+
 };
 
 #endif // FLOATFORM_H

fmTakeout/main.cpp

@@ -87,8 +87,13 @@ int main(int argc, char *argv[])
     FloatForm f;
     MainForm w;
     QObject::connect(&w, &MainForm::showFloatForm, &f, &FloatForm::onShow);
+
     QObject::connect(&FlowControl::GetInstance(), &FlowControl::startRemind, &f, &FloatForm::onStartRemind);
     QObject::connect(&FlowControl::GetInstance(), &FlowControl::doHideMainShowFloatFrom, &w, &MainForm::on_mainBtnHide_clicked);
+
+    QObject::connect(&FlowControl::GetInstance(), &FlowControl::doLockFloatForm, &f, &FloatForm::onLockFloatForm);
+    QObject::connect(&FlowControl::GetInstance(), &FlowControl::doUnLockFloatFrom, &f, &FloatForm::onUnLockFloatForm);
+
     QObject::connect(&w, &MainForm::startRemind, &f, &FloatForm::onStartRemind);
     QObject::connect(&w, &MainForm::stopRemind, &f, &FloatForm::onStopRemind);
     QObject::connect(&f, &FloatForm::showMainForm, &w, &MainForm::show);

fmTakeout/mainForm.cpp

@@ -207,6 +207,14 @@ void MainForm::on_mainBtnHide_clicked()
     showFloatForm();
 }
 
+/*
+void MainForm::on_mainBtnHideAndLockForm()
+{
+    on_mainBtnHide_clicked();
+    emit lockFloatForm();
+}
+*/
+
 void MainForm::onShowOrderDetails(OrderObject *orderObject)
 {
     m_detailForm->InitData(orderObject);

fmTakeout/mainForm.h

@@ -100,6 +100,7 @@ signals:
      * 返回:NULL
      * */
     void showFloatForm();
+
     /* 功能:通知悬浮窗开始提示
      * 参数:[1]提示类型 0新订单1退款申请
      * 返回:NULL

fmTakeout/preDefine.h

@@ -74,7 +74,7 @@
 #define JSON_SUBPRODUCTS        "addExtra"
 #define JSON_ID                 "id"
 #define JSON_ORDERID            "orderId"
-#define JSON_ORDER_ID            "order_id"
+#define JSON_ORDER_ID            "orderId"
 #define JSON_BUSINESSID         "businessId"
 #define JSON_REASON             "reason"
 #define JSON_REASONCODE         "reason_code"