fix bug: 更新代码接口注释，便于更加理解，更加专业

fmTakeout/Control/flowControl.cpp

@@ -16,7 +16,7 @@
 #include <QMultiMap>
 #include <QMap>
 #include <QFile>
-#include <DTools/orderstatus.h>
+#include <DTools/simProcOrderDB.h>
 #include <QHostInfo>
 
 
@@ -106,7 +106,7 @@ FlowControl::FlowControl()
     {
         QLOG_INFO() << QString("bind failed!");
     }
-    Orderstatus::getInstance();
+    SimProcOrderDB::getInstance();
     _ClickOMSAssignArea();
     m_loginTimer->start(20*1000);
 }
@@ -178,9 +178,9 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
         m_ordersMap.insert(orderObject->id, orderObject);
         QLOG_INFO() << QString("new order[%1:%2].[data:]")
                        .arg(orderObject->id,orderObject->getOrderStatusDec())<<jsonObject;
-        if(!Orderstatus::getInstance().isorderexit(orderObject->id))
+        if(!SimProcOrderDB::getInstance().isOrderExit(orderObject->id))
         {
-            Orderstatus::getInstance().statusinsert(orderObject->id,QDate::currentDate().toString("yyyy-MM-dd"));
+            SimProcOrderDB::getInstance().insertSimProcOrder(orderObject->id,QDate::currentDate().toString("yyyy-MM-dd"));
 
             if((OrderObject::NewOrder==orderObject->orderStatus||OrderObject::Confirmed==orderObject->orderStatus))
             {
@@ -206,20 +206,20 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
     {
         emit startRemind(1);
     }
-    if(Orderstatus::getInstance().isput(orderObject->id))
+    if(SimProcOrderDB::getInstance().isPushedOrder(orderObject->id))
     {
         orderObject->isPut = true;
     }
-    if(Orderstatus::getInstance().isrefund(orderObject->id))
+    if(SimProcOrderDB::getInstance().isRefundOrder(orderObject->id))
     {
         orderObject->isCancle = true;
     }
-    QString posSaledId=m_orderIdToPosSalesIdMap.value(orderObject->id);
-    if(posSaledId.isEmpty())
+    QString posOrderCheckNo=m_orderIdToPosSalesIdMap.value(orderObject->id);
+    if(posOrderCheckNo.isEmpty())
     {
-        Orderstatus::getInstance().getPosSalesId(orderObject->id,posSaledId);
+        SimProcOrderDB::getInstance().getPosOrderCheckNo(orderObject->id,posOrderCheckNo);
     }
-    orderObject->possaleId=posSaledId;
+    orderObject->posCheckNo=posOrderCheckNo;
     switch (orderObject->orderStatus){
     case OrderObject::NewOrder:
     case OrderObject::Confirmed:
@@ -252,7 +252,7 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
                 m_OrderEntryMutex.unlock();
             }
             else{
-                if(!posSaledId.isEmpty())
+                if(!posOrderCheckNo.isEmpty())
                 {
                     orderObject->putType = 0;
                     orderObject->putTimes = 0;
@@ -1047,7 +1047,7 @@ void FlowControl::_ClearOrder()
         }
     }
     m_OrderEntryMutex.unlock();
-    Orderstatus::getInstance().deleteRecord(QDate::currentDate().addMonths(-1).toString("yyyyMMdd"));
+    SimProcOrderDB::getInstance().deleteOrderRecord(QDate::currentDate().addMonths(-1).toString("yyyyMMdd"));
 }
 
 bool FlowControl::_GetReplyJson(const QJsonObject &content,QJsonObject &data, QString& error)
@@ -1222,12 +1222,12 @@ bool FlowControl::_Get04ReplyJson(const QJsonObject &content, QJsonObject &data,
 
                 if(order_p->putType==1)
                 {
-                    Orderstatus::getInstance().putupdate(orderId,1);
-                    Orderstatus::getInstance().PosSalesIdupdate(orderId,posSaleId);
+                    SimProcOrderDB::getInstance().updatePushOrderStatus(orderId,1);
+                    SimProcOrderDB::getInstance().updatePosOrderCheckNo(orderId,posSaleId);
                 }
                 else
                 {
-                    Orderstatus::getInstance().refundupdate(orderId,1);
+                    SimProcOrderDB::getInstance().updateRefundOrderStatus(orderId,1);
                 }
                 m_OrderEntryMutex.lock();
                 m_ordersEntryList.removeOne(orderId);
@@ -1351,7 +1351,7 @@ bool FlowControl::_GetQueryReplyJson(QJsonObject &data, QString &error, const QS
         rObj.insert("fm_ver", "1.0");
         cObj.insert("pay_id", "002");
         cObj.insert("pay_str", QString::fromLocal8Bit("非码外卖"));
-        cObj.insert("pos_sale_id", orderObject->possaleId);
+        cObj.insert("pos_sale_id", orderObject->posCheckNo);
         cObj.insert("order_status",orderObject->orderStatus);//订单的状态
         cObj.insert("pay_ebcode", orderObject->channel);
         cObj.insert("order_index", orderObject->orderIndex);

fmTakeout/DTools/orderstatus.cpp → fmTakeout/DTools/simProcOrderDB.cpp

-#include "orderstatus.h"
+#include "simProcOrderDB.h"
 #include "QsLog.h"
 #include <QCoreApplication>
 
-Orderstatus::Orderstatus()
+SimProcOrderDB::SimProcOrderDB()
 {
     m_mutex.lock();
-    QString dbpath=QCoreApplication::applicationDirPath()+QString("/orderstatus.db");
-    db=QSqlDatabase::addDatabase("QSQLITE","orderstaus_connection");
+    QString dbpath=QCoreApplication::applicationDirPath()+QString("/SimProcOrderDB.db");
+    db=QSqlDatabase::addDatabase("QSQLITE","SimProcOrderDB_connection");
     db.setDatabaseName(dbpath);
     if(!db.open())
     {
@@ -18,33 +18,33 @@ Orderstatus::Orderstatus()
     }
     QSqlQuery query(db);
     int isTableExist=0;
-    query.exec(QString("select count(*) from sqlite_master where type='table' and name='%1'").arg("status"));
+    query.exec(QString("select count(*) from sqlite_master where type='table' and name='%1'").arg("SimProcOrderTable"));
     while(query.next())
     {
         isTableExist = query.value(0).toInt();
     }
     if(!isTableExist){
-        QLOG_INFO() << "table status does not exist";
-        query.prepare(QString("create table status (orderId  varchar(20) primary key,isput int(1),isrefund int(1),isreport int(1),isbackreport int(1),posSalesId varchar(20),creatTime varchar(20))"));
+        QLOG_INFO() << "table SimProcOrderTable does not exist";
+        query.prepare(QString("create table SimProcOrderTable (orderId  varchar(20) primary key,isPushed int(1),isRefund int(1),isReport int(1),isBackReport int(1),posCheckNo varchar(20),creatTime varchar(20))"));
         if(!query.exec())
         {
             QLOG_ERROR()<<query.lastError().text()<<QString::number(query.lastError().type())<<"create table";
         }
     } else{
-        QLOG_INFO() << "table status exists";
+        QLOG_INFO() << "table SimProcOrderTable exists";
     }
     db.close();
     m_mutex.unlock();
-    //qDebug()<<query.lastError().text()<<"create table error";
+    //qDebug()<<query.lastError().text()<<"create table SimProcOrderTable error";
 }
 
-Orderstatus &Orderstatus::getInstance()
+SimProcOrderDB &SimProcOrderDB::getInstance()
 {
-    static Orderstatus order;
-    return order;
+    static SimProcOrderDB simProcOrderDB;
+    return simProcOrderDB;
 }
 
-bool Orderstatus::statusinsert(const QString &orderId,const QString& creatTime)
+bool SimProcOrderDB::insertSimProcOrder(const QString &orderId,const QString& creatTime)
 {
     m_mutex.lock();
     if(!db.open())
@@ -54,15 +54,15 @@ bool Orderstatus::statusinsert(const QString &orderId,const QString& creatTime)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("insert into status values('%1',0,0,0,0,NUll,'%6')").arg(orderId).arg(creatTime));
+    query.prepare(QString("insert into SimProcOrderTable values('%1',0,0,0,0,NUll,'%6')").arg(orderId).arg(creatTime));
     qDebug()<<creatTime;
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<QString::number(query.lastError().type())<<"statusinsert";
+        QLOG_ERROR()<<query.lastError().text()<<QString::number(query.lastError().type())<<"insertSimProcOrder";
         result = false;
     }
     else{
-        QLOG_INFO()<<QString("insert orderId %1 into status success").arg(orderId);
+        QLOG_INFO()<<QString("insert orderId %1 into SimProcOrderTable success").arg(orderId);
         result = true;
     }
     db.close();
@@ -70,7 +70,7 @@ bool Orderstatus::statusinsert(const QString &orderId,const QString& creatTime)
     return result;
 }
 
-bool Orderstatus::putupdate(const QString &orderId, const int &putstatus)
+bool SimProcOrderDB::updatePushOrderStatus(const QString &orderId, const int &pushOrderStatus)
 {
     m_mutex.lock();
     if(!db.open())
@@ -80,15 +80,15 @@ bool Orderstatus::putupdate(const QString &orderId, const int &putstatus)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("update status set isput=%1 where orderId='%2'")
-                  .arg(QString::number(putstatus)).arg(orderId));
+    query.prepare(QString("update SimProcOrderTable set isPushed=%1 where orderId='%2'")
+                  .arg(QString::number(pushOrderStatus)).arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<"putupdate";
+        QLOG_ERROR()<<query.lastError().text()<<"updatePushOrderStatus";
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("update orderId %1 putstatus success").arg(orderId);
+        QLOG_INFO()<<QString("update orderId %1 pushOrderStatus success").arg(orderId);
         result = true;
     }
     db.close();
@@ -96,7 +96,7 @@ bool Orderstatus::putupdate(const QString &orderId, const int &putstatus)
     return result;
 }
 
-bool Orderstatus::isput(const QString &orderId)
+bool SimProcOrderDB::isPushedOrder(const QString &orderId)
 {
     m_mutex.lock();
     if(!db.open())
@@ -106,10 +106,10 @@ bool Orderstatus::isput(const QString &orderId)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("select isput from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select isPushed from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isput";
+        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isPushed";
         result= false;
     }
     while(query.next())
@@ -121,7 +121,7 @@ bool Orderstatus::isput(const QString &orderId)
     return result;
 }
 
-bool Orderstatus::refundupdate(const QString &orderId, const int &refundstatus)
+bool SimProcOrderDB::updateRefundOrderStatus(const QString &orderId, const int &refundOrderStatus)
 {
     m_mutex.lock();
     if(!db.open())
@@ -131,15 +131,15 @@ bool Orderstatus::refundupdate(const QString &orderId, const int &refundstatus)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("update status set isrefund=%1 where orderId='%2'")
-                  .arg(QString::number(refundstatus)).arg(orderId));
+    query.prepare(QString("update SimProcOrderTable set isRefund=%1 where orderId='%2'")
+                  .arg(QString::number(refundOrderStatus)).arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<"refundupdate";
+        QLOG_ERROR()<<query.lastError().text()<<"updateRefundOrderStatus";
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("update orderId %1 refundstatus success").arg(orderId);
+        QLOG_INFO()<<QString("update orderId %1 refundOrderStatus success").arg(orderId);
         result = true;
     }
     db.close();
@@ -147,7 +147,7 @@ bool Orderstatus::refundupdate(const QString &orderId, const int &refundstatus)
     return result;
 }
 
-bool Orderstatus::isrefund(const QString &orderId)
+bool SimProcOrderDB::isRefundOrder(const QString &orderId)
 {
     m_mutex.lock();
     if(!db.open())
@@ -157,10 +157,10 @@ bool Orderstatus::isrefund(const QString &orderId)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("select isrefund from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select isRefund from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isrefund";
+        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isRefund";
         result= false;
     }
     while(query.next())
@@ -172,7 +172,7 @@ bool Orderstatus::isrefund(const QString &orderId)
     return result;
 }
 
-bool Orderstatus::reportupdate(const QString &orderId, const int &reportstatus)
+bool SimProcOrderDB::updateReportOrderStatus(const QString &orderId, const int &reportOrderStatus)
 {
     m_mutex.lock();
     if(!db.open())
@@ -182,15 +182,15 @@ bool Orderstatus::reportupdate(const QString &orderId, const int &reportstatus)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("update status set isreport=%1 where orderId='%2'")
-                  .arg(QString::number(reportstatus)).arg(orderId));
+    query.prepare(QString("update SimProcOrderTable set isReport=%1 where orderId='%2'")
+                  .arg(QString::number(reportOrderStatus)).arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<"reportupdate";
+        QLOG_ERROR()<<query.lastError().text()<<"updateReportOrderStatus";
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("update orderId %1 reportstatus success").arg(orderId);
+        QLOG_INFO()<<QString("update orderId %1 reportOrderStatus success").arg(orderId);
         result = true;
     }
     db.close();
@@ -198,7 +198,7 @@ bool Orderstatus::reportupdate(const QString &orderId, const int &reportstatus)
     return result;
 }
 
-bool Orderstatus::isreport(const QString &orderId)
+bool SimProcOrderDB::isReportOrder(const QString &orderId)
 {
     m_mutex.lock();
     if(!db.open())
@@ -208,10 +208,10 @@ bool Orderstatus::isreport(const QString &orderId)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("select isreport from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select isReport from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isreport";
+        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isReport";
         result= false;
     }
     while(query.next())
@@ -223,7 +223,7 @@ bool Orderstatus::isreport(const QString &orderId)
     return result;
 }
 
-bool Orderstatus::backreportupdate(const QString &orderId, const int &backreportstatus)
+bool SimProcOrderDB::updateBackReportOrderStatus(const QString &orderId, const int &backReportOrderStatus)
 {
     m_mutex.lock();
     if(!db.open())
@@ -233,15 +233,15 @@ bool Orderstatus::backreportupdate(const QString &orderId, const int &backreport
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("update status set isbackreport=%1 where orderId='%2'")
-                  .arg(QString::number(backreportstatus)).arg(orderId));
+    query.prepare(QString("update SimProcOrderTable set isBackReport=%1 where orderId='%2'")
+                  .arg(QString::number(backReportOrderStatus)).arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<"backreportupdate";
+        QLOG_ERROR()<<query.lastError().text()<<"updateBackReportOrderStatus";
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("update orderId %1 backreportupdate success").arg(orderId);
+        QLOG_INFO()<<QString("update orderId %1 backReportOrderStatus success").arg(orderId);
         result = true;
     }
     db.close();
@@ -249,7 +249,7 @@ bool Orderstatus::backreportupdate(const QString &orderId, const int &backreport
     return result;
 }
 
-bool Orderstatus::isbackreport(const QString &orderId)
+bool SimProcOrderDB::isBackReportOrder(const QString &orderId)
 {
     m_mutex.lock();
     if(!db.open())
@@ -259,10 +259,10 @@ bool Orderstatus::isbackreport(const QString &orderId)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("select isbackreport from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select isBackReport from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isreport";
+        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isBackReport";
         result= false;
     }
     while(query.next())
@@ -273,7 +273,7 @@ bool Orderstatus::isbackreport(const QString &orderId)
     m_mutex.unlock();
     return result;
 }
-bool Orderstatus::isorderexit(const QString &orderId)
+bool SimProcOrderDB::isOrderExit(const QString &orderId)
 {
     m_mutex.lock();
     if(!db.open())
@@ -283,10 +283,10 @@ bool Orderstatus::isorderexit(const QString &orderId)
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("select orderId from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select orderId from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
-        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isorderexit";
+        QLOG_ERROR()<<query.lastError().text()<<orderId<<"isOrderExit";
         result= false;
     }
     if(query.first())
@@ -301,7 +301,7 @@ bool Orderstatus::isorderexit(const QString &orderId)
     return result;
 }
 
-bool Orderstatus::PosSalesIdupdate(const QString &orderId, const QString &posSalesId)
+bool SimProcOrderDB::updatePosOrderCheckNo(const QString &orderId, const QString &posOrderCheckNo)
 {
     m_mutex.lock();
     if(!db.open())
@@ -311,15 +311,15 @@ bool Orderstatus::PosSalesIdupdate(const QString &orderId, const QString &posSal
     }
     bool result;
     QSqlQuery query(db);
-    query.prepare(QString("update status set posSalesId='%1' where orderId='%2'")
-                  .arg(posSalesId).arg(orderId));
+    query.prepare(QString("update SimProcOrderTable set posCheckNo='%1' where orderId='%2'")
+                  .arg(posOrderCheckNo).arg(orderId));
     if(!query.exec())
     {
         QLOG_ERROR()<<query.lastError().text()<<__FUNCTION__;
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("update orderId %1 posSalesId success").arg(orderId);
+        QLOG_INFO()<<QString("update orderId %1 posCheckNo success").arg(orderId);
         result = true;
     }
     db.close();
@@ -327,7 +327,7 @@ bool Orderstatus::PosSalesIdupdate(const QString &orderId, const QString &posSal
     return result;
 }
 
-bool Orderstatus::getPosSalesId(const QString &orderId,QString& posSalesId)
+bool SimProcOrderDB::getPosOrderCheckNo(const QString &orderId,QString& posOrderCheckNo)
 {
     m_mutex.lock();
     bool result=false;
@@ -337,7 +337,7 @@ bool Orderstatus::getPosSalesId(const QString &orderId,QString& posSalesId)
         return result;
     }
     QSqlQuery query(db);
-    query.prepare(QString("select posSalesId from status where orderId='%1'").arg(orderId));
+    query.prepare(QString("select posCheckNo from SimProcOrderTable where orderId='%1'").arg(orderId));
     if(!query.exec())
     {
         QLOG_ERROR()<<query.lastError().text()<<orderId<<__FUNCTION__;
@@ -345,7 +345,7 @@ bool Orderstatus::getPosSalesId(const QString &orderId,QString& posSalesId)
     }
     while(query.next())
     {
-        posSalesId= query.value(0).toString();
+        posOrderCheckNo= query.value(0).toString();
         result=true;
     }
     db.close();
@@ -353,7 +353,7 @@ bool Orderstatus::getPosSalesId(const QString &orderId,QString& posSalesId)
     return result;
 }
 
-bool Orderstatus::deleteRecord(QString creatTime)
+bool SimProcOrderDB::deleteOrderRecord(QString creatTime)
 {
     m_mutex.lock();
     if(!db.open())
@@ -363,7 +363,7 @@ bool Orderstatus::deleteRecord(QString creatTime)
     }
     bool result=true;
     QSqlQuery query(db);
-    query.prepare(QString("delete from status where creatTime<'%1'").arg(creatTime));
+    query.prepare(QString("delete from SimProcOrderTable where creatTime<'%1'").arg(creatTime));
     if(!query.exec())
     {
         QLOG_ERROR()<<query.lastError().text()<<__FUNCTION__;
@@ -375,7 +375,7 @@ bool Orderstatus::deleteRecord(QString creatTime)
 }
 
 
-bool Orderstatus::queryValue(const QString &orderId, const QString& key,  QString &error, QVariant & value)
+bool SimProcOrderDB::queryValue(const QString &orderId, const QString& key,  QString &error, QVariant & value)
 {
     QMutexLocker mutex(&m_mutex);
     if(!db.open())
@@ -384,7 +384,7 @@ bool Orderstatus::queryValue(const QString &orderId, const QString& key,  QStrin
         return false;
     }
     QSqlQuery query(db);
-    query.prepare(QString("select %1 from status where orderId='%1'").arg(key).arg(orderId));
+    query.prepare(QString("select %1 from SimProcOrderTable where orderId='%1'").arg(key).arg(orderId));
     if(!query.exec())
     {
         error.append(query.lastError().text());
@@ -401,7 +401,7 @@ bool Orderstatus::queryValue(const QString &orderId, const QString& key,  QStrin
     return true;
 }
 
-bool Orderstatus::updatekey(const QString &orderId, const QString &key, const int value,  QString &error, bool &result)
+bool SimProcOrderDB::updatekey(const QString &orderId, const QString &key, const int value,  QString &error, bool &result)
 {
     QMutexLocker mutex(&m_mutex);
     if(!db.open())
@@ -410,7 +410,7 @@ bool Orderstatus::updatekey(const QString &orderId, const QString &key, const in
         return false;
     }
     QSqlQuery query(db);
-    query.prepare(QString("update status set %1=%2 where orderId='%3'").arg(key)
+    query.prepare(QString("update SimProcOrderTable set %1=%2 where orderId='%3'").arg(key)
                   .arg(QString::number(value)).arg(orderId));
     if(!query.exec())
     {
@@ -425,7 +425,7 @@ bool Orderstatus::updatekey(const QString &orderId, const QString &key, const in
     return true;
 }
 
-bool Orderstatus::queryIsNull(const QString &orderId, const QString &key, QString &error, bool &result)
+bool SimProcOrderDB::queryIsNull(const QString &orderId, const QString &key, QString &error, bool &result)
 {
     QMutexLocker mutex(&m_mutex);
     if(!db.open())
@@ -434,7 +434,7 @@ bool Orderstatus::queryIsNull(const QString &orderId, const QString &key, QStrin
         return false;
     }
     QSqlQuery query(db);
-    query.prepare(QString("select %1 from status where orderId=%2 and %3 is null").arg(orderId,orderId,key));
+    query.prepare(QString("select %1 from SimProcOrderTable where orderId=%2 and %3 is null").arg(orderId,orderId,key));
     if(!query.exec())
     {
         error.append(query.lastError().text());

fmTakeout/DTools/orderstatus.h → fmTakeout/DTools/simProcOrderDB.h

 /******************
 *进行sqlite操作
 ******************/
-#ifndef ORDERSTATUS_H
-#define ORDERSTATUS_H
+#ifndef SIMPROCORDERDB_H
+#define SIMPROCORDERDB_H
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include <QObject>
 #include <QMutex>
 
-class Orderstatus : public QObject
+class SimProcOrderDB : public QObject
 {
     Q_OBJECT
 public:
-   // explicit Orderstatus(QObject *parent = 0);
+   // explicit SimProcOrderDB(QObject *parent = 0);
 
-    static Orderstatus& getInstance();
+    static SimProcOrderDB& getInstance();
     /**
-    *功能:插入一条新数据
-    *参数:[1]订单号
+    *功能:插入一条Simphony返回小票号的订单新数据
+    *参数:[1]订单号 [2]创建时间
     *返回:true操作成功，false失败
     **/
-    bool statusinsert(const QString& orderId, const QString &creatTime);
+    bool insertSimProcOrder(const QString& orderId, const QString &creatTime);
     /**
-    *功能:更新入账状态
-    *参数:[1]订单号[2]入账状态
+    *功能:更新推单的入账状态[POS录单状态:订单录销售单的意思；同时也用来标记POS是否打印过录单小票]
+    *参数:[1]订单号[2]入账状态(目前情况都是"1")
     *返回:true操作成功，false失败
     **/
-    bool putupdate(const QString& orderId, const int &putstatus);
+    bool updatePushOrderStatus(const QString& orderId, const int &pushOrderStatus);
     /**
-    *功能:查询是否入账
+    *功能:查询是否入账[POS新单录单：即模拟Simphony点单是否成功：成功:TRUE;未成功:FALSE]
     *参数:[1]订单号
     *返回:true是，false否
     **/
-    bool isput(const QString& orderId);
+    bool isPushedOrder(const QString& orderId);
     /**
-    *功能:更新退款入账状态
+    *功能:更新退款入账状态[POS退款录单状态:订单录退款单的意思；同时也用来标记POS是否打印过退款单小票]
     *参数:[1]订单号[2]退款入账状态
     *返回:true操作成功，false失败
     **/
-    bool refundupdate(const QString& orderId, const int &refundstatus);
+    bool updateRefundOrderStatus(const QString& orderId, const int &refundOrderStatus);
     /**
-    *功能:查询是否退款入账
+    *功能:查询是否退款入账[POS退款录单：即模拟Simphony退单是否成功：成功:TRUE;未成功:FALSE]
     *参数:[1]订单号
     *返回:true是，false否
     **/
-    bool isrefund(const QString& orderId);
+    bool isRefundOrder(const QString& orderId);
     /**
-    *功能:更新汇报入账状态
+    *功能:更新汇报入账状态 [POS汇报入账状态:录订单汇报的意思；同时也用来标记POS是否?????????]
     *参数:[1]订单号[2]汇报入账状态
     *返回:true操作成功，false失败
     **/
-    bool reportupdate(const QString& orderId, const int &reportstatus);
+    bool updateReportOrderStatus(const QString& orderId, const int &reportOrderStatus);
     /**
-    *功能:查询是否汇报入账
+    *功能:查询是否汇报入账 [POS订单是否汇报入账：判断Simphony 汇报入单是否成功：成功:TRUE;未成功:FALSE]
     *参数:[1]订单号
     *返回:true是，false否
     **/
-    bool isreport(const QString& orderId);
+    bool isReportOrder(const QString& orderId);
     /**
-    *功能:更新汇报入账状态
+    *功能:更新back汇报入账状态[POS汇报入账状态:录订单汇报的意思；同时也用来标记POS是否?????????]
     *参数:[1]订单号[2]汇报入账状态
     *返回:true操作成功，false失败
     **/
-    bool backreportupdate(const QString& orderId, const int &backreportstatus);
+    bool updateBackReportOrderStatus(const QString& orderId, const int &backReportOrderStatus);
     /**
-    *功能:查询是否汇报入账
+    *功能:查询是否back汇报入账 [POS订单是否汇报入账：判断Simphony 汇报入单是否成功：成功:TRUE;未成功:FALSE]
     *参数:[1]订单号
     *返回:true是，false否
     **/
-    bool isbackreport(const QString& orderId);
+    bool isBackReportOrder(const QString& orderId);
     /**
     *功能:查询订单是否存在
     *参数:[1]订单号
     *返回:true是，false否
     **/
-    bool isorderexit(const QString& orderId);
-    bool PosSalesIdupdate(const QString& orderId, const QString &posSalesId);
+    bool isOrderExit(const QString& orderId);
 
-    bool getPosSalesId(const QString& orderId, QString &posSalesId);
+    /**
+    *功能:更新订单的pos小票号；
+    *参数:[1]订单号
+    *返回:true是，false否
+    **/
+    bool updatePosOrderCheckNo(const QString& orderId, const QString &posOrderCheckNo);
+
+    /**
+    *功能:获取订单的pos小票号；
+    *参数:[1]订单号 [2]带出参数：用来存放参数1对应的小票号的值;
+    *返回：true是，false否
+    **/
+    bool getPosOrderCheckNo(const QString& orderId, QString &posOrderCheckNo);
 
     bool queryValue(const QString& orderId, const QString& key, QString& error, QVariant &value);
 
@@ -86,13 +97,17 @@ public:
 
     bool queryIsNull(const QString &orderId, const QString& key,QString &error, bool &result);
 
-
-    bool deleteRecord(QString creatTime);
+    /**
+    *功能:删除指定时间的订单记录
+    *参数:[1]订单号
+    *返回:true是，false否
+    **/
+    bool deleteOrderRecord(QString creatTime);
 private:
     QMutex m_mutex;
-    Orderstatus();
-    Orderstatus(Orderstatus const&);
-    Orderstatus& operator=(Orderstatus const&);
+    SimProcOrderDB();
+    SimProcOrderDB(SimProcOrderDB const&);
+    SimProcOrderDB& operator=(SimProcOrderDB const&);
     QSqlDatabase db;
 
 signals:
@@ -100,4 +115,4 @@ signals:
 public slots:
 };
 
-#endif // ORDERSTATUS_H
+#endif // SIMPROCORDERDB_H

fmTakeout/Model/orderObject.h

@@ -43,7 +43,7 @@ class OrderObject : public QObject
     Q_PROPERTY (QString latitude READ getLatitude WRITE setLatitude)
     Q_PROPERTY (QString street READ getStreet WRITE setStreet)
     Q_PROPERTY (QString addressDetail READ getAddressDetail WRITE setAddressDetail)
-    Q_PROPERTY (QString possaleId READ getPossaleId WRITE setPossaleId)
+    Q_PROPERTY (QString posCheckNo READ getPosCheckNo WRITE setPosCheckNo)
     Q_PROPERTY (int updateTime READ getUpdateTime WRITE setUpdateTime)
     Q_PROPERTY (int needInvoice READ getNeedInvoice WRITE setNeedInvoice)
     Q_PROPERTY (int deliveryPrice READ getDeliveryPrice WRITE setDeliveryPrice)
@@ -86,7 +86,7 @@ public:
     QString watercourseId; //流水号（取餐号）
     QString customerId; //用户编号
     QString customerName;//用户名称
-    QString possaleId;
+    QString posCheckNo;
     QString phone;
     QString msr_no;
     QString storeId;
@@ -229,8 +229,8 @@ public:
     inline QString getAddressDetail()const{return addressDetail;}
     inline void setAddressDetail(const QString& v){addressDetail = v;}
 
-    inline QString getPossaleId()const{return possaleId;}
-    inline void setPossaleId(const QString& v){possaleId = v;}
+    inline QString getPosCheckNo()const{return posCheckNo;}
+    inline void setPosCheckNo(const QString& v){posCheckNo = v;}
 
     inline int getOrderIndex()const{return orderIndex;}
     inline void setOrderIndex(const int& v){orderIndex = v;}

fmTakeout/fmTakeout.pro

@@ -44,7 +44,6 @@ SOURCES += main.cpp\
     DTools/clickedLineEdit.cpp \
     RejectForm.cpp \
     DTools/headframe.cpp \
-    DTools/orderstatus.cpp \
     bstatusForm.cpp \
     bstatusItem.cpp \
     dishesForm.cpp \
@@ -53,7 +52,8 @@ SOURCES += main.cpp\
     refdishesForm.cpp \
     refuseForm.cpp \
     dailyreportForm.cpp \
-    Model/dailyObject.cpp
+    Model/dailyObject.cpp \
+    DTools/simProcOrderDB.cpp
 
 HEADERS  += \
     mainForm.h \
@@ -75,7 +75,6 @@ HEADERS  += \
     DTools/clickedLineEdit.h \
     RejectForm.h \
     DTools/headframe.h \
-    DTools/orderstatus.h \
     bstatusForm.h \
     bstatusItem.h \
     dishesForm.h \
@@ -85,7 +84,8 @@ HEADERS  += \
     refuseForm.h \
     dailyreportForm.h \
     Model/dailyObject.h \
-    DTools/dump.h
+    DTools/dump.h \
+    DTools/simProcOrderDB.h
 
 FORMS    += mainForm.ui \
     alertForm.ui \