Add 1：增加针对超过10小时的订单核销

fmPrinter/fmPrinter.cpp

@@ -176,7 +176,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
             print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)).append(pData->channelName).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(deliveryStr).append("|").append(QString("备注:")+pData->remark.remove(QChar('|'), Qt::CaseInsensitive)).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).append("|").append(m_appUrl).append("|").append("下载APP 积分换好礼");
+                    append(pData->phone).append("|").append("http://qr10.cn/Du2Cfw").append("|").append("下载APP 积分换好礼");
     }
     //鲜丰水果
     // if(!v.compare("顾客留存"))

fmTakeaway/Control/flowControl.cpp

@@ -221,7 +221,7 @@ bool FlowControl::_PullOrder()
                     //旧数据有更新
                     int oldStatus = orderObject->status;
                     orderObject->FromJson(jsonObject);
-                    orderObject->remark.remove("#");
+                    orderObject->remark.remove("|");
 
                     //将 非码Mall 改为 鲜丰App
                     if(!orderObject->channelName.compare("非码Mall"))
@@ -900,24 +900,73 @@ void FlowControl::onReEntryOrder(const QString &orderId)
 
 void FlowControl::onSerachOrder(const QString &text)
 {
+    qDebug() << "开始搜索" <<text;
     QStringList orderIdList;
     if(!text.isEmpty())
     {
+
         QMap<QString, OrderObject*>::iterator order;
         for(order = m_ordersMap.begin(); order!=m_ordersMap.end(); order++)
         {
             QString orderId = order.key();
-            while (!orderId.at(0).isDigit())
-            {
-                orderId = orderId.mid(1);
-            }
+            qDebug() << orderId;
+
             if(orderId.startsWith(text))
             {
                 orderIdList.append(order.key());
             }
         }
+
+    }
+    if(orderIdList.isEmpty())
+    {
+        emit showAlert(AlertForm::LOADING, "正在获取订单信息......");
+
+        QString error;
+        bool result;
+        QJsonObject sendJson;
+        QJsonObject recvJson;
+
+        sendJson = DataManger::GetInstance().GetPullSingleOrder(text);
+
+        emit showAlert(AlertForm::LOADING, "正在通信......");
+        QLOG_INFO() << QString("[---PullSingleOrder---]. [requestData:%1]").arg(_GetJsonStr(sendJson));
+        result = m_procOrderSocket->Request(sendJson, recvJson, error);
+        QLOG_INFO() << QString("PullSingleOrder finsh. [result:%1][msg:%2][recvData:%3]")
+                       .arg(result).arg(error, _GetJsonStr(recvJson));
+        if(!result)
+        {
+            emit showAlert(AlertForm::ERROR, "拉取订单失败![网络错误]");
+        }else
+        {
+            if(JSON_STATUSCODE_OK != recvJson[JSON_STATUSCODE].toInt())
+            {
+                result = false;
+                emit showAlert(AlertForm::ERROR, QString("拉取订单失败![%1]").arg(recvJson[JSON_MESSAGE].toString()));
+            }else
+            {
+                //新数据
+                OrderObject *orderObject = new OrderObject(this);
+                orderObject->FromJson(recvJson["order"].toObject());
+                orderObject->remark.remove("|");
+
+                //将 非码Mall 改为 鲜丰App
+                if(!orderObject->channelName.compare("非码Mall"))
+                {
+                    orderObject->channelName = "鲜丰App";
+                }
+
+                m_ordersMap.insert(orderObject->order_id, orderObject);
+                emit changeOrderStatus(orderObject);
+                orderIdList.append(orderObject->order_id);
+                emit showSearchOrderResult(orderIdList);
+            }
+        }
+    }else
+    {
+        emit showSearchOrderResult(orderIdList);
     }
-    emit showSearchOrderResult(orderIdList);
+    qDebug() << "开始搜索333333333333333";
 }
 
 void FlowControl::onRefund(const QString &orderId, const QString &reason)

fmTakeaway/DTools/dataManger.cpp

@@ -178,3 +178,14 @@ QJsonObject DataManger::GetChargeOffData(const QString &orderId)
     rObj.insert(JSON_POSVERSION, APP_VERSION);
     return rObj;
 }
+
+QJsonObject DataManger::GetPullSingleOrder(const QString &orderId)
+{
+    QJsonObject rObj, cObj;
+    rObj.insert("reqtype", 30);
+    cObj.insert("order_id", orderId);
+    rObj.insert("order", cObj);
+    rObj.insert("token", m_token);
+
+    return rObj;
+}

fmTakeaway/DTools/dataManger.h

@@ -80,6 +80,12 @@ public:
      * */
     QJsonObject GetChargeOffData(const QString& orderId);
 
+    /* 功能:拉取单个订单信息的请求数据
+     * 参数:[1]订单ID
+     * 返回:JSON数据
+     * */
+    QJsonObject GetPullSingleOrder(const QString& orderId);
+
 private:
     DataManger(){}
     DataManger(DataManger const&);

fmTakeaway/mainForm.cpp

@@ -48,7 +48,12 @@ MainForm::MainForm(QWidget *parent) :
     connect(&FlowControl::GetInstance(), &FlowControl::showCashierPickForm, this, &MainForm::onShowCashierPickForm);
     connect(&FlowControl::GetInstance(), &FlowControl::showOrderDetails, this, &MainForm::onShowOrderDetails);
     // 搜索订单的信号槽
-    connect(ui->mainEdtSearch, &ClickedLineEdit::textChanged, &FlowControl::GetInstance(), &FlowControl::onSerachOrder);
+    connect(ui->mainEdtSearch, &ClickedLineEdit::returnPressed, [this]
+    {
+        qDebug() << "。。。。。。。。。。。。搜索订单。。。。。。。。。。";
+        emit serachOrder(ui->mainEdtSearch->text());
+    });
+    connect(this, &MainForm::serachOrder, &FlowControl::GetInstance(), &FlowControl::onSerachOrder);
     connect(&FlowControl::GetInstance(), &FlowControl::showSearchOrderResult, this, &MainForm::onShowSearchOrderResult);
     // 初始化界面
     _Init();
@@ -106,7 +111,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.2.5");
+    ui->mainLabVersion->setText("1.2.6");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表
@@ -218,6 +223,7 @@ void MainForm::onShowOrderDetails(OrderObject *orderObject)
 
 void MainForm::onShowSearchOrderResult(const QStringList &orderIdList)
 {
+    qDebug() << "-------------------onShowSearchOrderResult---------------------";
     if(orderIdList.isEmpty())
     {
         m_resultForm->hide();
@@ -230,10 +236,13 @@ void MainForm::onShowSearchOrderResult(const QStringList &orderIdList)
         m_resultForm->hide();
         m_padForm->hide();
         ui->mainEdtSearch->clear();
+    }else
+    {
+        m_resultForm->clear();
+        m_resultForm->addItems(orderIdList);
+        m_resultForm->show();
     }
-    m_resultForm->clear();
-    m_resultForm->addItems(orderIdList);
-    m_resultForm->show();
+
 }
 
 void MainForm::onshow()

fmTakeaway/mainForm.h

@@ -130,6 +130,8 @@ signals:
      * */
     void onSerachTextChanged(const QString&);
 
+    void serachOrder(QString);
+
 
 private slots:
     /* 功能:初始化