插件更新

Model/baseObject.cpp

@@ -34,8 +34,6 @@ void BaseObject::FetchDataFromJson(const QJsonObject &json)
     QStringList keys = json.keys();
     foreach(QString key, keys)
     {
-        qDebug()<<"key.toUtf8()"<<key.toUtf8();
-        qDebug()<<"json[key].toVariant()"<<json[key].toVariant();
         setProperty(key.toUtf8(), json[key].toVariant());
     }
     return;

Thread/workThread/flowcontroll.cpp

@@ -98,6 +98,7 @@ bool flowControll::_Login()
             emit hideAlert();
             emit setStoreInfo(m_storeId);
             _PullOrder();
+            Orderstatus::getInstance();
             _SynStock();
         }
     }
@@ -230,15 +231,15 @@ bool flowControll::_PullOrder()
                     GetChannelName(orderObject);
                     if(!Orderstatus::getInstance().isorderexit(orderObject->order_id))
                         Orderstatus::getInstance().statusinsert(orderObject->order_id,0,0);
-//                    if(!SelectOrderId(orderObject))
-//                    {
-//                        saveSqlite(orderObject);
+                    if(!SelectOrderId(orderObject))
+                    {
+                        saveSqlite(orderObject);
 //                        if(orderObject->status != 1)
 //                        {
 //                          DoSalesSlip(orderObject,0); //写销售单
 //                        }
-//                      //  emit sgnNewIdPrint(orderObject,new_orderid); //新订单打印
-//                    }
+                        emit sgnNewIdPrint(orderObject,new_orderid); //新订单打印
+                    }
                 }
                 else
                 {
@@ -552,6 +553,7 @@ void flowControll::saveSqlite(OrderObject* orderObject )
                 }
             }
         }
+        database.close();
 }
 
 void flowControll::DeleteQuery()
@@ -568,7 +570,7 @@ bool flowControll::SelectOrderId(OrderObject* orderObject)
         bool var = querysafe.exec(QString("select * from Fmtakeout_table WHERE order_id='%1'").arg(orderObject->order_id));
         if(!var)
         {
-            QLOG_INFO()<< "查询数据库订单ID为空";
+            QLOG_INFO()<< QString::fromLocal8Bit("查询数据库订单ID为空");
             return 0;
         }
         else
@@ -584,7 +586,7 @@ bool flowControll::SelectOrderId(OrderObject* orderObject)
   else
   {
       return 0;
-      QLOG_INFO()<< "查询数据库的订单失败";
+      QLOG_INFO()<< QString::fromLocal8Bit("查询数据库的订单失败");
   }
 
 }
@@ -592,7 +594,13 @@ bool flowControll::SelectOrderId(OrderObject* orderObject)
 bool flowControll::OpenSqlite()
 {
     UseSQLite();
-    QString apppath=QCoreApplication::applicationDirPath()+"/database/Fmtakeout.s3db";
+    QString apppath=QCoreApplication::applicationDirPath()+"/database/";
+    QDir dir(apppath);
+    if(!dir.exists())
+    {
+        dir.mkdir(apppath);
+    }
+    apppath += QString("Fmtakeout.s3db");
     qDebug()<<"path is "<<apppath;
     if(!QFile::exists(apppath))
     {
@@ -629,52 +637,47 @@ QString flowControll::_Penny2Dollar(int penny)
 
 void flowControll::Balance()     //各个渠道日结算
 {
-    int m_user_free = 0; int m_discount_fee=0; int m_total_fee=0;QString m_str_total_free="";
-    if(OpenSqlite())
-    {
-        QSqlQuery querysafe(database);
-        for (int i=0; i< strArray.count();i++)
-        {
-            int var = 0;
-            querysafe.exec(QString("select * from Fmtakeout_table where create_time > date('now','start of day') and channelName='%1'").arg(QString(strArray.at(i))));
-
-            while(querysafe.next())
-            {
-              m_total_fee += querysafe.value(4).toInt();
-              m_discount_fee +=querysafe.value(6).toInt();
-              m_user_free += querysafe.value(8).toInt();
-              var++;
-            }
-            m_str_total_free = m_str_total_free.trimmed() + strArray.at(i).mid(0,1).trimmed() +"        " + QString::number(var,10).trimmed()+"      "+ _Penny2Dollar(m_total_fee).trimmed()+"    "
-                              +_Penny2Dollar(m_discount_fee).trimmed()+"     "+_Penny2Dollar(m_user_free).trimmed()+"|";
-        }
-        Total_Num();
-        SelectTime();
-        m_str_total_free = m_storeId +"|"+m_posId+"|"+m_first_time+" - "+m_last_time+"|"+m_str_total_free +InitClass::GetInstance().GB2312ToUnicode("总计:")+"     "+QString::number(m_var_,10)+"      "+_Penny2Dollar(total_num)+"    "+_Penny2Dollar(discount_num)
-                +"     "+_Penny2Dollar(user_num)+"      ";
-        qDebug()<<m_str_total_free;
-    }
-    emit sgnBalance(m_str_total_free,"balance");
+    int m_user_free[8] = {0}; int m_discount_fee[8]={0}; int m_total_fee[8]={0};QString m_str_total_free="";
+       if(OpenSqlite())
+       {
+           QSqlQuery querysafe(database);
+           for (int i=0; i< strArray.count();i++)
+           {
+               int var = 0;
+               querysafe.exec(QString("select * from Fmtakeout_table where create_time > date('now','start of day') and channelName='%1'").arg(QString(strArray.at(i))));
+
+               while(querysafe.next())
+               {
+                 m_total_fee[i] += querysafe.value(4).toInt();
+                 m_discount_fee[i] +=querysafe.value(6).toInt();
+                 m_user_free[i] += querysafe.value(8).toInt();
+                 var++;
+                 m_var_++;
+               }
+               m_str_total_free = m_str_total_free.trimmed() + strArray.at(i).mid(0,1).trimmed() +"        " + QString::number(var,10).trimmed()+"      "+ _Penny2Dollar(m_total_fee[i]).trimmed()+"    "
+                                 +_Penny2Dollar(m_discount_fee[i]).trimmed()+"     "+_Penny2Dollar(m_user_free[i]).trimmed()+"|";
+           }
+           Total_Num();
+           SelectTime();
+           m_str_total_free = m_storeId +"|"+m_posId+"|"+m_first_time+" - "+m_last_time+"|"+m_str_total_free +InitClass::GetInstance().GB2312ToUnicode("总计:")+"     "+QString::number(m_var_,10)+"      "+_Penny2Dollar(total_num)+"    "+_Penny2Dollar(discount_num)
+                   +"     "+_Penny2Dollar(user_num)+"      ";
+           qDebug()<<m_str_total_free;
+       }
+       emit sgnBalance(m_str_total_free,"balance");
 }
 
 void flowControll::Total_Num()
 {
     qDebug()<<strArray.count();
-    for (int i=0; i< strArray.count();i++)
-    {
-        QString total=QString("select sum(total_fee) ,sum(user_fee),sum(discount_fee) from Fmtakeout_table where create_time > datetime('now','start of day') and channelName='%1'").arg(QString(strArray.at(i)));
+        QString total=QString("select sum(total_fee) ,sum(user_fee),sum(discount_fee) from Fmtakeout_table where create_time > datetime('now','start of day')");
         QSqlQuery querysafe(total);
         while(querysafe.next())
         {
-            total_num += total_num;
-            user_num += user_num;
-            discount_num += discount_num;
             total_num +=querysafe.value(0).toInt();
             user_num +=querysafe.value(1).toInt();
             discount_num += querysafe.value(2).toInt();
-            m_var_++;
         }
-    }
+
 }
 
 void flowControll::SelectTime()
@@ -1556,7 +1559,7 @@ bool flowControll::_RefundOrder(const QString& orderId, QString reason)//退单
          int rlt= pSocket->write(m_pFmPackage+curSendLength,toSendLength - curSendLength);
          pSocket->waitForBytesWritten();
          if(rlt==-1){
-             QLOG_ERROR() << "发送数据失败：" << data;
+             QLOG_ERROR() << QString::fromLocal8Bit("发送数据失败：") << data;
              result=false;
              break;
          }

Tool/HttpSocket.cpp

@@ -16,6 +16,7 @@ HttpSocket::~HttpSocket()
 {
     if(m_time)
     {
+        m_time->stop();
         delete m_time;
         m_time = 0;
     }

Tool/orderstatus.cpp

@@ -5,19 +5,18 @@
 Orderstatus::Orderstatus()
 {
     QString dbpath=QCoreApplication::applicationDirPath()+QString("/orderstatus.db");
-    //db.addDatabase("QSQLITE");
-    QSqlDatabase db=QSqlDatabase::addDatabase("QSQLITE");
-    //db.setDatabaseName("orderstatus.db");
-    db.setDatabaseName(dbpath);
-    if(!db.open())
+    m_db = QSqlDatabase::addDatabase("QSQLITE",QString("fm_order_status_table"));
+    m_db.setDatabaseName(dbpath);
+    if(!m_db.open())
     {
-        QString error=db.lastError().text();
+        QString error=m_db.lastError().text();
         QLOG_ERROR()<<QString("Qsqlite database open filed,%1").arg(error);
+        return ;
     }
     else{
         QLOG_INFO()<<QString("Qsqlite database open successed");
     }
-    QSqlQuery query;
+    QSqlQuery query(m_db);
     int isTableExist;
     query.exec(QString("select count(*) from sqlite_master where type='table' and name='%1'").arg("status"));
     while(query.next())
@@ -26,7 +25,8 @@ Orderstatus::Orderstatus()
     }
     if(!isTableExist){
         QLOG_INFO() << "table status does not exist";
-        query.exec(QString("create table status (orderId  varchar(20) primary key, isentry int(1),isrefund int(1))"));
+        bool creat=query.exec(QString("create table status (orderId  varchar(20) primary key, isentry int(1),isrefund int(1))"));
+        QLOG_INFO()<<creat;
     } else{
         QLOG_INFO() << "table status exists";
     }
@@ -41,7 +41,11 @@ Orderstatus &Orderstatus::getInstance()
 
 bool Orderstatus::statusinsert(const QString &orderId, const int &entrystatus,const int &refundstatus)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("insert into status values('%1',%2,%3)").arg(orderId).arg(QString::number(entrystatus)).arg(QString::number(refundstatus)));
     if(!query.exec())
     {
@@ -56,7 +60,12 @@ bool Orderstatus::statusinsert(const QString &orderId, const int &entrystatus,co
 
 bool Orderstatus::entryupdate(const QString &orderId, const int &entrystatus)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        QLOG_INFO()<<"m_db is not open";
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("update status set isentry=%1 where orderId='%2'").arg(QString::number(entrystatus)).arg(orderId));
     if(!query.exec())
     {
@@ -71,26 +80,38 @@ bool Orderstatus::entryupdate(const QString &orderId, const int &entrystatus)
 
 bool Orderstatus::isentry(const QString &orderId)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        QLOG_INFO()<<"m_db is not open";
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("select isentry from status where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<"isentry";
+        QLOG_ERROR()<<query.lastError().text()<<"isentry"<<orderId;
+        QLOG_INFO()<<query.lastError().type();
         return false;
     }
     while(query.next())
     {
         return query.value(0).toBool();
     }
+    return false;
 }
 
 bool Orderstatus::refundupdate(const QString &orderId, const int &refundstatus)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("update status set isrefund=%1 where orderId='%2'").arg(QString::number(refundstatus)).arg(orderId));
     if(!query.exec())
     {
         QLOG_ERROR()<<query.lastError().text()<<"refundupdate";
+        QLOG_INFO()<<query.lastError().type();
         return false;
     }
     else{
@@ -101,7 +122,11 @@ bool Orderstatus::refundupdate(const QString &orderId, const int &refundstatus)
 
 bool Orderstatus::isrefund(const QString &orderId)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("select isrefund from status where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
@@ -115,7 +140,11 @@ bool Orderstatus::isrefund(const QString &orderId)
 }
 bool Orderstatus::isorderexit(const QString &orderId)
 {
-    QSqlQuery query;
+    if(!m_db.isOpen())
+    {
+        m_db.open();
+    }
+    QSqlQuery query(m_db);
     query.prepare(QString("select orderId from status where orderId='%1'").arg(orderId));
     if(!query.exec())
     {

Tool/orderstatus.h

@@ -25,6 +25,7 @@ private:
     Orderstatus();
     Orderstatus(Orderstatus const&);
     Orderstatus& operator=(Orderstatus const&);
+    QSqlDatabase m_db;
 
 signals:
 

Ui/DetailForm.cpp

@@ -263,6 +263,8 @@ void DetailForm::SettingPrintData(QString data)
     {
         emit DetailshowAlert(alertForm::ERROR,InitClass::GetInstance().GB2312ToUnicode("请选择合适的打印机打印"));
     }
+    qDebug()<<"this is data "<<data;
+    qDebug()<<"getVar bool is "<<getVar;
     emit sgnToPrint(data,"");
     if(!getVar)
     {

Ui/MainWindow.cpp

@@ -233,18 +233,18 @@ void MainWindow::onMainClose()
 
 void MainWindow::styleshow()
 {
-//    #ifndef RELEASE_MODE
-//    this->setWindowFlags(Qt::WindowStaysOnTopHint|Qt::Tool);
-//    this->hide();
-//    this->setCursor(Qt::ArrowCursor);
-//    QLOG_INFO() << QString("debug mode");
-//    #else
+    #ifndef RELEASE_MODE
+    this->setWindowFlags(Qt::WindowStaysOnTopHint|Qt::Tool);
+    this->hide();
+    this->setCursor(Qt::ArrowCursor);
+    QLOG_INFO() << QString("debug mode");
+    #else
     this->setWindowFlags(Qt::WindowStaysOnTopHint|Qt::Tool);
     this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
     this->hide();
     this->setCursor(Qt::ArrowCursor);
 //    QLOG_INFO() << QString("release mode");
-//    #endif
+   #endif
 }
 
 void MainWindow::onMainTabBtnClicked()
@@ -292,7 +292,7 @@ void MainWindow::showMain()
 #ifdef QT_DEBUG
   //     setWindowFlags(Qt::WindowStaysOnTopHint|Qt::Tool);
   //     show();
-        this->showFullScreen();
+        this->show();
 #else
       this->showFullScreen();
 #endif

fmp_takeout.cpp

 #include "fmp_takeout_p.h"
 #include "fmp_te_handlers.h"
-FMPTakeout::FMPTakeout(ctkPluginContext *context)
-    : FMPTakeoutInterface(context),
+FMPTakeout::FMPTakeout(const FMPContext ctx)
+    : FMPTakeoutInterface(),
+      context(ctx),
       _inited(false),
       d_ptr(new FMPTakeoutPrivate(this))
 {
-    FMPStartEventHandler *se = new FMPStartEventHandler(_ctx, this);
+    FMPStartEventHandler *se = new FMPStartEventHandler(this);
 }
 
 FMPTakeout::~FMPTakeout()

fmp_takeout.h

@@ -14,18 +14,18 @@ class FMPTakeout : public FMPTakeoutInterface
     Q_DECLARE_PRIVATE(FMPTakeout)
 
 public:
-    explicit            FMPTakeout(ctkPluginContext *context);
+    explicit            FMPTakeout(const FMPContext ctx);
     virtual             ~FMPTakeout();
 
 protected:
     void                UninitService();
     void                InitService();
-
+    const FMPContext    GetContext() const { return context; }
 
 private:
-    bool                    _inited;
-    FMPTakeoutPrivate*     d_ptr;
-
+    bool                _inited;
+    FMPTakeoutPrivate*  d_ptr;
+    const FMPContext    context;
 
 signals:
 

fmp_takeout_i.h

@@ -15,7 +15,7 @@ class FMPTakeoutInterface : public QObject, public FMPluginInterface
     Q_INTERFACES(FMPBaseInterface)
     Q_INTERFACES(FMPluginInterface)
 public:
-    explicit            FMPTakeoutInterface(ctkPluginContext *ctx) : FMPluginInterface(ctx)
+    explicit            FMPTakeoutInterface() : FMPluginInterface()
     {
         connect(this, &FMPTakeoutInterface::TriggerInit, this, &FMPTakeoutInterface::OnTriggerInit, Qt::UniqueConnection);
         connect(this, &FMPTakeoutInterface::TriggerUninit, this, &FMPTakeoutInterface::OnTriggerUninit, Qt::UniqueConnection);
@@ -30,7 +30,7 @@ protected slots:
     void                OnTriggerUninit() { FMPluginInterface::OnTriggerUninit(); }
 };
 
-Q_DECLARE_INTERFACE(FMPTakeoutInterface, "com.fmp.takeout")
+Q_DECLARE_INTERFACE(FMPTakeoutInterface, "fmp.takeout")
 
 
 #endif // FMPTAKEOUTINTERFACE_H

fmp_takeout_p.cpp

 #include "fmp_takeout_p.h"
 #include <fmp_settings_i.h>
 #include <QDateTime>
-#include <ctkPluginContext.h>
-#include <ctkServiceReference.h>
 #include "Tool/initclass.h"
 #include "QsLog/QsLog.h"
 #include <QDir>
@@ -28,8 +26,8 @@ int FMPTakeoutPrivate::Init()
     {
         if(0 == q->_inited)
             {
-                _Home = q->GetService<FMPHomeInterface>(q->_ctx);
-                _Printer= q->GetService<FMPPrinterInterface>(q->_ctx);
+                _Home = FMP::GetService<FMPHomeInterface>();
+                _Printer= FMP::GetService<FMPPrinterInterface>();
                 InitApp();
                 q->_inited = true;
                 return FMP_SUCCESS;
@@ -50,19 +48,7 @@ int FMPTakeoutPrivate::Uninit()
 {
     Q_Q(FMPTakeout);
     emit sgnStopTime();
-    if(_Printer != nullptr)
-    {
-        _Printer = 0;
-    }
 
-    if(_Home!= nullptr)
-    {
-        _Home = 0;
-    }
-    if(_settings!= nullptr)
-    {
-        _settings = 0;
-    }
     q->_inited = false;
     return FMP_SUCCESS;
 }
@@ -82,7 +68,7 @@ void FMPTakeoutPrivate::sltStopBlink(int type)
 void FMPTakeoutPrivate::sltPrint(QString data,QString label)
 {
     if (_Printer) {
-        //emit sgnReceiveStatus(_Printer->DoPrint(data,label));
+        emit sgnReceiveStatus(_Printer->DoPrint(data,label));
     }
 }
 

fmp_takeout_plugin.cpp

@@ -47,8 +47,6 @@ void FMPTakeoutPlugin::stop(ctkPluginContext* context)
     delete _takeout_service;
     _takeout_service = 0;
   }
-
-  int a = 0;
 }
 
 #if (QT_VERSION < QT_VERSION_CHECK(5,0,0))

fmp_te_handlers.cpp

 #include "fmp_te_handlers.h"
 #include "fmp_takeout.h"
 
-FMPStartEventHandler::FMPStartEventHandler(ctkPluginContext *ctx, FMPTakeout *Takeout)
-    : FMPTakeoutEventHandler(FMP_TOPICS_SERVICES FMPE_SERVICE_ACK_START "/"+ QString::number(ctx->getPlugin()->getPluginId()),
-       Takeout),
-      _ctx(ctx)
+FMPStartEventHandler::FMPStartEventHandler(FMPTakeout *Takeout)
+    : FMPTakeoutEventHandler(FMP_TOPICS_SERVICES FMPE_SERVICE_ACK_START "/"+ QString::number(Takeout->GetPluginId()),
+                             Takeout)
 {
     FMPProps props;
     props[ctkEventConstants::EVENT_TOPIC] = _topic;
-    _ctx->registerService<ctkEventHandler>(this, props);
+    FMP::RegisterService<ctkEventHandler>(this, props);
 }
 
 void FMPStartEventHandler::handleEvent(const ctkEvent &event)

fmp_te_handlers.h

@@ -23,11 +23,8 @@ class FMPStartEventHandler : public QObject, public FMPTakeoutEventHandler
     Q_OBJECT
     Q_INTERFACES(ctkEventHandler)
 public:
-    explicit            FMPStartEventHandler(ctkPluginContext *ctx, FMPTakeout *Takeout);
+    explicit            FMPStartEventHandler(FMPTakeout *Takeout);
     void                handleEvent(const ctkEvent &event);
-
-private:
-    ctkPluginContext*   _ctx;
 };