1.打印放在component 2.补打逻辑修改

fmTakeaway/controls/flowControl.cpp

@@ -145,7 +145,8 @@ FlowControl::FlowControl()
 void FlowControl::Start()
 {
     QLOG_INFO() << QString(">>>>>>>>>>>>>>>>>>程序启动%1<<<<<<<<<<<<<<<<<<").arg(PRODUCT_VERSION);
-    QString storeId = ConfigManage::Instance().storeId();
+//    QString storeId = ConfigManage::Instance().storeId();
+    QString storeId = ConfigManage::Instance().cloudStoreId();
     if( !storeId.isEmpty() )
     {
         m_storeInfo.sotoreId = storeId;

fmTakeaway/detailform.cpp

@@ -202,6 +202,38 @@ void DetailForm::on_detail_btnReprint_clicked()
         QLOG_ERROR() << "read print configruation failed!";
         return;
     }
+
+    //获取发票二维码地址
+    QString fileName = QCoreApplication::applicationDirPath() +
+            "/printer/" +
+            QDate::currentDate().toString("yyyy-MM-dd") +
+            "/barcode.txt";
+    QFile file(fileName);
+    QDir().mkpath(QFileInfo(fileName).absolutePath());
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
+       qDebug() << "read printed failed!";
+        return false;
+    }
+    QTextStream in(&file);
+    QString String = in.readLine();    //返回文件的一行，不包含换行符。
+    while(!String.isNull())
+    {
+        QJsonObject ret;
+        QJsonParseError err;
+        QJsonDocument doc = QJsonDocument::fromJson(String.toUtf8(), &err);
+        if (err.error != QJsonParseError::NoError)
+        {
+            return;
+        }
+        ret = doc.object();
+
+        if(ret.keys().at(0) == m_orderObj->order_id)
+        {
+            m_orderObj->barcodeId = ret[m_orderObj->order_id].toString();
+        }
+
+    }
     QString error;
     PrintLib::GetInstance().DoPrint(QString::fromLocal8Bit(file.readAll()), m_orderObj, error);
     QLOG_INFO() << "print result: " << error;

fmTakeaway/mainwindow.cpp

@@ -288,6 +288,16 @@ void MainWindow::_GetOrderAdditional(OrderObject *orderObj, QTableWidget *&table
             }
             break;
             case 6:
+            //已完成的订单申请退单时 status：6 refund_status:20,
+            //插件没做处理，问题解决 2022/10/12
+            if(orderObj->refund_status == 20)
+            {
+                statusDesc = "申请退款";
+                operation = OPERATION_AGREE_REFUND;
+                table = ui->main_tableDCL;
+                break;
+            }
+
             if(orderObj->refund_status == 22)
             {
                 statusDesc = "申请部分退款";
@@ -466,7 +476,7 @@ void MainWindow::onUpdateOrderDisplay(OrderObject *orderObj)
         }
     }
 
-    _PrintNewOrder(orderObj);
+//    _PrintNewOrder(orderObj);
     // 插入订单
     orderObj->table = table;
     table->insertRow(0);

fmTakeaway/models/orderObject.h

@@ -143,6 +143,7 @@ class OrderObject : public QObject
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
     Q_PROPERTY (QStringList dis_desc READ getdis_desc WRITE setdis_desc)
     Q_PROPERTY (int total_amount READ gettotal_amount WRITE settotal_amount)
+    Q_PROPERTY (QString barcodeId READ getbarcodeId WRITE setbarcodeId)
 
 public:
     OrderObject(QObject* parent = 0):QObject(parent){}
@@ -286,6 +287,9 @@ private:
     inline int gettotal_amount(){ return total_amount; }
     inline void settotal_amount(const int& v){ total_amount = v; }
 
+    inline QString getbarcodeId(){ return barcodeId; }
+    inline void setbarcodeId(const QString& v){ barcodeId = v; }
+
 public:
     QString order_id;   // 订单ID
     QString order_view_id;  // 美团订单号，其他平台为空
@@ -336,6 +340,7 @@ public:
 
     // 自定义属性
     QTableWidget *table = nullptr;  //  记录该订单目前在哪个表格中
+    QString barcodeId;    //发票二维码地址
 };
 
 #endif // ORDEROBJECT_H

fmTakeaway/tools/configManage.cpp

@@ -34,6 +34,8 @@ ConfigManage::ConfigManage()
     m_clientIni = new QSettings(QString("%1/client.ini").arg(g_appDir), QSettings::IniFormat);
     m_userIni = new QSettings(QString("%1/user.ini").arg(g_appDir), QSettings::IniFormat);
     m_printerIni = new QSettings(QString("%1/printer.ini").arg(g_appDir), QSettings::IniFormat);
+    m_stockIni = new QSettings(QString("%1/stock.ini").arg(g_appDir), QSettings::IniFormat);
+    m_storeIni = new QSettings(QString("%1/store.ini").arg(g_appDir), QSettings::IniFormat);
 }
 
 

fmTakeaway/tools/configManage.h

@@ -148,7 +148,7 @@ public:
 
     //  库存同步时间间隔，单位秒
     inline int stockSyncInterval(){
-        return m_userIni->value("stock/intervalSync", 30).toInt();
+        return m_clientIni->value("stock/intervalSync", 30).toInt();
     }
 
     //  是否进行库存同步
@@ -156,6 +156,17 @@ public:
         return m_userIni->value("stock/enable", false).toBool();
     }
 
+    //云pos门店信息
+    inline QString cloudStoreId()
+    {
+        return m_storeIni->value("storeInfo/storeId").toString();
+    }
+    inline void setCloudStoreId(const QString& storeId)
+    {
+        return m_storeIni->setValue("storeInfo/storeId", storeId);
+    }
+
+
 private:
     ConfigManage();
 
@@ -163,6 +174,8 @@ private:
     QSettings *m_clientIni;
     QSettings *m_userIni;
     QSettings *m_printerIni;
+    QSettings *m_stockIni;
+    QSettings *m_storeIni;
 };
 
 #endif // CONFIGMANAGE_H