fix bug: 修复众多BUG

fmTakeout/Control/flowControl.h

@@ -120,6 +120,13 @@ signals:
      * 返回:NULL
      * */
     void showAlert(AlertForm::Type type, const QString& msg);
+
+    /* 功能:隐藏主界面显示悬浮窗口
+     * 参数:[1]窗口类型[2]显示信息
+     * 返回:NULL
+     * */
+    void doHideMainShowFloatFrom();
+
     /* 功能:设置主界面门店信息
      * 参数:[1]门店号
      * 返回:NULL

fmTakeout/DTools/dataManger.cpp

@@ -157,7 +157,7 @@ QJsonObject DataManger::GetRefundOrderData(int reasonCode,const QString &reason,
     // 其他退单原因;
     else{
         rObj.insert(JSON_ORDERID, orderId);
-        rObj.insert("canceledCause", reason);
+        rObj.insert("canceledCause", reasonCode);
         rObj.insert(JSON_POSIPADDRESS,QString("http://") + m_posIpAddress);
         //rObj.insert(JSON_CODE, reasonCode);
         //rObj.insert(JSON_CHANNEL,channel);

fmTakeout/DTools/printSumBillPosDB.cpp

@@ -7,31 +7,28 @@
 
 PrintSumBillPosDB::PrintSumBillPosDB()
 {
-    QLOG_INFO()<<"[<<<<---Try Open Pos SqlServer DataBase--->>>>]";
+    QLOG_INFO()<<"[<<<<---PrintSumBillPosDB:: Structure POS Print CheckNo INFO DataBase--->>>>]";
 }
 
 
 bool PrintSumBillPosDB::initPrintSumBillPosDB(){
     //QString dbPath = QString(ConfigManage::Instance().databasePath());
-    m_sqlDb = QSqlDatabase::addDatabase("QODBC");   //数据库驱动类型为SQL Server
+    m_sqlDb = QSqlDatabase::addDatabase("QODBC","PrintSumBillPosDB");   //数据库驱动类型为SQL Server
     if(m_sqlDb.isValid()){
         QLOG_INFO()<<"[<<<<---SqlServer ODBC driver is valid--->>>>]";
-        QString dsn="DRIVER={SQL SERVER};SERVER=127.0.0.1\\sqlexpress;DATABASE=MMXBenefits"; //数据源名称 QT_FmConnectPosDb
+        QString dsn="DRIVER={SQL SERVER};SERVER=127.0.0.1\\sqlexpress;DATABASE=MMXBenefits";
         m_sqlDb.setDatabaseName(dsn);                            //设置数据源名称
         m_sqlDb.setUserName("sa");                               //登录用户
         m_sqlDb.setPassword("SIM29@123");
 
-        if(!m_sqlDb.open())                                      //打开数据库
-        {
+        if(!m_sqlDb.open()) {                                      //打开数据库
             QLOG_ERROR()<<"[<<<<---SqlServer Open Database error:--->>>>]"<<m_sqlDb.lastError().text();
-        }
-        else {
+        } else {
             QLOG_INFO()<<"[<<<<---SqlServer Test Open database success!:--->>>>]";
             m_sqlDb.close();
             return true;
         }
-    }
-    else {
+    } else {
         QLOG_ERROR()<<"[<<<<---SqlServer ODBC driver no valid--->>>>]";
     }
     return false;
@@ -44,9 +41,8 @@ PrintSumBillPosDB &PrintSumBillPosDB::getInstance()
 }
 
 bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& posCheckNo){
-    m_mutex.lock();
-    if(!m_sqlDb.open())
-    {
+    QMutexLocker mutex(&m_mutex);
+    if(!m_sqlDb.open()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
         return false;
     }
@@ -58,7 +54,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
                   "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     query.addBindValue(posCheckNo.toInt()); // --小票号
     query.addBindValue(orderObj->lastName); // --顾客-姓
-    query.addBindValue(orderObj->customerName); // --顾客-全名
+    query.addBindValue(orderObj->consigneeName); // --顾客-全名
     QString temp_customerSex;
     if( !orderObj->customerSex.compare(QString::fromLocal8Bit(FM_MALE)) || !orderObj->customerSex.compare(QString("Male")) ){
         temp_customerSex = "Male";
@@ -95,20 +91,17 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
                      .arg(orderObj->consigneeName).arg(orderObj->addressDetail).arg(orderObj->consigneePhone).arg(orderObj->id)
                      .arg(orderObj->waybillId).arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()).arg(orderObj->riderPhone).arg(orderObj->riderName);
         result = false;
-    }
-    else{
+    } else {
         QLOG_INFO()<<QString("[<<<<---SqlServer Database:Insert OrderId %1 Into customer_info Success--->>>>]").arg(orderObj->id);
         result = true;
     }
     m_sqlDb.close();
-    m_mutex.unlock();
     return result;
 }
 
 bool PrintSumBillPosDB::updateOrderSumBillStatus(OrderObject* orderObj, const int &OrderStatus){
-    m_mutex.lock();
-    if(!m_sqlDb.open())
-    {
+    QMutexLocker mutex(&m_mutex);
+    if(!m_sqlDb.open()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
         return false;
     }
@@ -116,92 +109,75 @@ bool PrintSumBillPosDB::updateOrderSumBillStatus(OrderObject* orderObj, const in
     QSqlQuery query(m_sqlDb);
     query.prepare(QString("update tb_msr_customer_info set OrderStatus=%1 where order_id='%2'")
                   .arg(QString::number(OrderStatus)).arg(orderObj->id));
-    if(!query.exec())
-    {
+    if(!query.exec()) {
         QLOG_ERROR()<<query.lastError().text()<<"[<<<<---SqlServer Database:update Order Status Failed--->>>>]";
         result= false;
-    }
-    else{
+    } else {
         QLOG_INFO()<<QString("[<<<<---SqlServer Database:Update OrderId %1 OrderStatus success--->>>>]").arg(orderObj->id);
         result = true;
     }
     m_sqlDb.close();
-    m_mutex.unlock();
     return result;
 }
 
 bool PrintSumBillPosDB::isOrderAndCknoSumBillExist(const QString& orderId,const QString& posCheckNo){
-    m_mutex.lock();
-    if(!m_sqlDb.open())
-    {
+    QMutexLocker mutex(&m_mutex);
+    if(!m_sqlDb.open()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
         return false;
     }
     bool result;
     QSqlQuery query(m_sqlDb);
     query.prepare(QString("select order_id from tb_msr_customer_info where order_id='%1' and chk_num='%2'").arg(orderId).arg(posCheckNo));
-    if(!query.exec())
-    {
+    if(!query.exec()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:isOrderAndCknoSumBillExit--->>>>]"<<orderId<<query.lastError().text();
         result= false;
     }
-    if(query.first())
-    {
+    if(query.first()) {
         result= true;
-    }
-    else{
+    } else {
         result = false;
     }
     m_sqlDb.close();
-    m_mutex.unlock();
     return result;
 }
 
 bool PrintSumBillPosDB::isOrderSumBillExist(const QString& orderId){
-    m_mutex.lock();
-    if(!m_sqlDb.open())
-    {
+    QMutexLocker mutex(&m_mutex);
+    if(!m_sqlDb.open()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
         return false;
     }
     bool result;
     QSqlQuery query(m_sqlDb);
     query.prepare(QString("select order_id from tb_msr_customer_info where order_id='%1'").arg(orderId));
-    if(!query.exec())
-    {
+    if(!query.exec()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:isOrderSumBillExit--->>>>]"<<orderId<<query.lastError().text();
         result= false;
     }
-    if(query.first())
-    {
+    if(query.first()) {
         result= true;
-    }
-    else{
+    } else {
         result = false;
     }
     m_sqlDb.close();
-    m_mutex.unlock();
     return result;
 }
 
 bool PrintSumBillPosDB::queryValue(const QString& orderId, const QString& key, QString& error, QVariant &value){
     QMutexLocker mutex(&m_mutex);
-    if(!m_sqlDb.open())
-    {
+    if(!m_sqlDb.open()) {
         error.append(QString("SqlServer Database:Open Failed").append(m_sqlDb.lastError().text()));
         return false;
     }
     QSqlQuery query(m_sqlDb);
     query.prepare(QString("select %1 from tb_msr_customer_info where order_id='%1'").arg(key).arg(orderId));
-    if(!query.exec())
-    {
+    if(!query.exec()) {
         error.append(query.lastError().text());
         m_sqlDb.close();
         return false;
-    }
-    else{
-        while(query.next())
-        {
+    } else {
+        while(query.next()) {
             value= query.value(0);
         }
     }
@@ -211,25 +187,20 @@ bool PrintSumBillPosDB::queryValue(const QString& orderId, const QString& key, Q
 
 bool PrintSumBillPosDB::queryIsNull(const QString &orderId, const QString& key,QString &error, bool &result){
     QMutexLocker mutex(&m_mutex);
-    if(!m_sqlDb.open())
-    {
+    if(!m_sqlDb.open()) {
         error.append(QString("SqlServer Database:Open Failed").append(m_sqlDb.lastError().text()));
         return false;
     }
     QSqlQuery query(m_sqlDb);
     query.prepare(QString("select %1 from tb_msr_customer_info where order_id=%2 and %3 is null").arg(orderId,orderId,key));
-    if(!query.exec())
-    {
+    if(!query.exec()) {
         error.append(query.lastError().text());
         m_sqlDb.close();
         return false;
-    }
-    else{
-        if(query.first())
-        {
+    } else {
+        if(query.first()) {
             result= true;
-        }
-        else{
+        } else{
             result = false;
         }
     }

fmTakeout/DTools/simProcOrderDB.h

@@ -16,6 +16,13 @@ public:
    // explicit SimProcOrderDB(QObject *parent = 0);
 
     static SimProcOrderDB& getInstance();
+
+    /**
+    *功能:初始化数据库
+    *参数:[1]订单号 [2]创建时间
+    */
+    bool initSimProcOrderDB();
+
     /**
     *功能:插入一条Simphony返回小票号的订单新数据
     *参数:[1]订单号 [2]创建时间
@@ -108,7 +115,7 @@ private:
     SimProcOrderDB();
     SimProcOrderDB(SimProcOrderDB const&);
     SimProcOrderDB& operator=(SimProcOrderDB const&);
-    QSqlDatabase db;
+    QSqlDatabase m_sqlDb;
 
 signals:
 

fmTakeout/main.cpp

@@ -88,6 +88,7 @@ int main(int argc, char *argv[])
     MainForm w;
     QObject::connect(&w, &MainForm::showFloatForm, &f, &FloatForm::onShow);
     QObject::connect(&FlowControl::GetInstance(), &FlowControl::startRemind, &f, &FloatForm::onStartRemind);
+    QObject::connect(&FlowControl::GetInstance(), &FlowControl::doHideMainShowFloatFrom, &w, &MainForm::on_mainBtnHide_clicked);
     QObject::connect(&w, &MainForm::startRemind, &f, &FloatForm::onStartRemind);
     QObject::connect(&w, &MainForm::stopRemind, &f, &FloatForm::onStopRemind);
     QObject::connect(&f, &FloatForm::showMainForm, &w, &MainForm::show);

fmTakeout/mainForm.h

@@ -165,11 +165,13 @@ private slots:
      * 返回:NULL
      * */
     void on_mainBtnSet_clicked();
+
     /* 功能:隐藏按钮对应动作
      * 参数:NULL
      * 返回:NULL
      * */
-    void on_mainBtnHide_clicked();
+    //void on_mainBtnHide_clicked();
+
     /* 功能:上翻按钮对应动作
      * 参数:NULL
      * 返回:NULL
@@ -214,6 +216,12 @@ private slots:
     void on_mainBtnDayReport_clicked();
 
 public slots:
+    /* 功能:隐藏按钮对应动作
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void on_mainBtnHide_clicked();
+
     /* 功能:隐藏通知窗口
      * 参数:NULL
      * 返回:NULL