fix bug: 修复 订单检索功能，各个表格按时间倒序排列，美化网络异常功，完善，退单后窗体残留

fmTakeout/Model/orderObject.h

@@ -12,6 +12,7 @@ class OrderObject : public QObject
 
     Q_PROPERTY (QString id READ getId WRITE setId)
     Q_PROPERTY (QString payfmId READ getPayfmId WRITE setPayfmId)
+    Q_PROPERTY (QString thirdPartyBatch READ getThirdPartyBatch WRITE setThirdPartyBatch)
     Q_PROPERTY (int orderType READ getOrderType WRITE setOrderType)
     Q_PROPERTY (QString orgOrderId READ getOrgOrderId WRITE setOrgOrderId)
     Q_PROPERTY (QString waybillId READ getWaybillId WRITE setWaybillId)
@@ -87,6 +88,7 @@ public:
 
     QString id;  //编号
     QString payfmId;  //FM唯一码
+    QString thirdPartyBatch;  //第三方交易流水号
     int orderType; //订单类型: 用来区分是 正常订单(1) 预订单(2) 还是 客诉单:3 (星巴克定义客诉单的类型:12);
     QString orgOrderId; //原始订单编号
     QString waybillId;  //运单号
@@ -150,6 +152,10 @@ public:
     inline QString getPayfmId()const{return payfmId;}
     inline void setPayfmId(const QString& v){payfmId = v;}
 
+    inline QString getThirdPartyBatch()const{return thirdPartyBatch;}
+    inline void setThirdPartyBatch(const QString& v){thirdPartyBatch = v;}
+
+
     inline int getOrderType()const{return orderType;}
     inline void setOrderType(const int& v){orderType = v;}
 

fmTakeout/Network/billSocket.cpp

@@ -4,6 +4,7 @@
 #include "preDefine.h"
 #include <QEventLoop>
 #include <QTimer>
+#include <QFile>
 #include <QSslConfiguration>
 
 BillSocket::BillSocket(QObject *parent)
@@ -99,4 +100,30 @@ 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/";
+    // 创建客户端证书
+    QFile fileCrt(keyDir+"客户端证书.pem");
+    if (!fileCrt.open(QIODevice::ReadOnly))
+         qDebug() << "!fileCrt.open==" ;
+    const QSslCertificate certificate(&fileCrt, QSsl::Pem);
+    fileCrt.close();
+
+    // 创建客户端私钥
+    QFile fileKey(keyDir+"key.pem");
+    fileKey.open(QIODevice::ReadOnly);
+    const QSslKey prvateKey(&fileKey, QSsl::Rsa);
+    fileKey.close();
+
+    m_sslConfig.setPeerVerifyMode(QSslSocket::VerifyNone);
+    m_sslConfig.setProtocol(QSsl::TlsV1_0);
+    m_sslConfig.setPrivateKey(prvateKey);
+    m_sslConfig.setLocalCertificate(certificate);
+    //加入ssl配置信息
+    m_networkRequest.setSslConfiguration(m_sslConfig);
+    m_networkR
+    */
+
 }

fmTakeout/mainForm.cpp

@@ -35,6 +35,7 @@ MainForm::MainForm(QWidget *parent) :
     qRegisterMetaType<dishesObject>("dishesObject");
     qRegisterMetaType< QMap< QString, QMultiMap<QString, dishesObject> > >("QMap<QString, QMultiMap<QString, dishesObject>>");
     qRegisterMetaType< QMap<QString, int> >("QMap<QString, int>");
+    qRegisterMetaType< QMap<QString, QString> >("QMap<QString, QString>");
 
     // 连接信号槽
     connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime);
@@ -96,7 +97,7 @@ void MainForm::MyShow()
 
     m_resultForm = new QListWidget(this);
     m_resultForm->setObjectName("mainListWdg0");
-    m_resultForm->setFixedSize(340, 200);
+    m_resultForm->setFixedSize(400, 200);
     m_resultForm->move(70, ui->mainFrmSearch->pos().y()-190);
     m_resultForm->hide();
     connect(m_resultForm, &QListWidget::itemClicked, this, &MainForm::onSearchResultItemClicked);
@@ -180,11 +181,9 @@ void MainForm::onMainTabBtnClicked()
     _RevertBtnTable();
     QPushButton *btn = (QPushButton*)sender();
     m_currentTable = findChild<QTableWidget*>(btn->property("tableName").toString());
-
     m_currentTable->show();
     btn->setChecked(true);
     btn->setEnabled(false);
-
     m_prevBtn = btn;
     m_prevTable = m_currentTable;
 }
@@ -216,9 +215,8 @@ void MainForm::onShowOrderDetails(OrderObject *orderObject)
 
 void MainForm::onShowSearchOrderResult(const QMap<QString,QString>& orderIdList)
 {
-
-    if(orderIdList.isEmpty())
-    {
+    QLOG_INFO() << QString("[<<<<---MainForm::onShowSearchOrderResult: orderIdList.length:%1 --->>>>]").arg(orderIdList.count());
+    if(orderIdList.isEmpty()) {
         m_resultForm->hide();
         return;
     }
@@ -271,6 +269,8 @@ void MainForm::_SetTablesSortEnable(bool bEnable)
     foreach (QTableWidget *table, m_tableList)
     {
         table->setSortingEnabled(bEnable);
+        // 默认按 第六列的订单创建时间降序;
+        table->sortByColumn(5,Qt::DescendingOrder);
     }
 }
 

fmTakeout/mainForm.ui

@@ -1017,7 +1017,7 @@
           </column>
           <column>
            <property name="text">
-            <string>操作</string>
+            <string>异常原因</string>
            </property>
           </column>
          </widget>

fmTakeout/preDefine.h

@@ -55,6 +55,7 @@
 #define JSON_USERID             "userId"
 #define JSON_BUSINESSDATE       "business_date"
 #define JSON_STATUSCODE         "statusCode"
+#define JSON_LOGINCODE         "code"
 #define JSON_ERRCODE            "code"
 #define JSON_STATUS             "status"
 #define JSON_ORDERSTATUS        "orderStatus"

fmTakeout/refdishesForm.cpp

@@ -8,18 +8,15 @@ refDishesForm::refDishesForm(QWidget *parent) :
     ui(new Ui::refDishesForm)
 {
     ui->setupUi(this);
-
     setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint);
     setAttribute(Qt::WA_TranslucentBackground);
     this->setModal(true);
-
     connect(this, &refDishesForm::updDishes, &FlowControl::GetInstance(), &FlowControl::onUpdDishesForRef);
 }
 
 refDishesForm::~refDishesForm()
 {
     delete ui;
-
 }
 
 void refDishesForm::InitData(OrderObject *obj)
@@ -81,11 +78,12 @@ void refDishesForm::InitData(OrderObject *obj)
 void refDishesForm::_Init()
 {
     ui->refDishesBtnOk->setEnabled(false);
-
     foreach(QPushButton* btn, m_btnList)
     {
+        QWidget* parentQWid = btn->parentWidget();
         disconnect(btn, &QPushButton::toggled, this, &refDishesForm::onDishesBtnToggled);
         delete btn;
+        parentQWid->deleteLater();
     }
     m_btnList.clear();
 
@@ -99,6 +97,7 @@ void refDishesForm::_Init()
     {
         ui->refDishesTable->removeRow(i);
     }
+    ui->refDishesTable->clear();
     m_dishesMap.clear();
 }