Fix 1:修复APP渠道id为非码微店

fmTakeaway/Control/flowControl.cpp

@@ -172,7 +172,7 @@ bool FlowControl::_PullOrder()
                     orderObject->remark.remove("|");
 
                     //将 非码Mall 改为 鲜丰App
-                    if(!orderObject->channelName.compare("非码Mall"))
+                    if(!orderObject->channelName.compare("非码微店"))
                     {
                         orderObject->channelName = "鲜丰App";
                     }
@@ -224,7 +224,7 @@ bool FlowControl::_PullOrder()
                     orderObject->remark.remove("|");
 
                     //将 非码Mall 改为 鲜丰App
-                    if(!orderObject->channelName.compare("非码Mall"))
+                    if(!orderObject->channelName.compare("非码微店"))
                     {
                         orderObject->channelName = "鲜丰App";
                     }
@@ -606,7 +606,8 @@ bool FlowControl::_ChargeOffOrder(const QString &orderId)
                 int num = tmpIni.value(QString("%1/num").arg(m_ordersMap.value(orderId)->channel), 1).toInt();
                 for(int i=0; i<num; i++)
                 {
-                    if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), m_ordersMap.value(orderId)))
+                    if(FmPrinter::GetInstance().
+                            DoPrint(ConfigManger::GetInstance().GetPrinterName(), m_ordersMap.value(orderId)))
                     {
                         QLOG_INFO() << QString("print sucessful");
                         Orderstatus::getInstance().printupdate(orderId,1);
@@ -968,7 +969,7 @@ void FlowControl::onSerachOrder(const QString &text)
                 orderObject->remark.remove("|");
 
                 //将 非码Mall 改为 鲜丰App
-                if(!orderObject->channelName.compare("非码Mall"))
+                if(!orderObject->channelName.compare("非码微店"))
                 {
                     orderObject->channelName = "鲜丰App";
                 }

fmTakeaway/mainForm.cpp

@@ -111,7 +111,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.2.9");
+    ui->mainLabVersion->setText("1.3.4");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表